repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Fix D/F conflicts
2010-07-09
Eli
j
ah Ne
w
ren
merg
e
-recur
s
ive: Fix D/F confli
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Al
e
xande
r
G
l
ady
s
h
Add a rena
m
e
+
D
/F co
n
fl
i
ct test
c
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Elijah
Newren
Add additiona
l
t
e
stcas
e
s
f
or
D
/F c
o
nfli
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-24
Junio C Hamano
Git 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-24
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-04-23
Eric
R
aymond
Do
c
u
menta
t
ion imp
r
o
v
ements for the descri
p
tio
n
of short
.
.
.
the bug noted by
Junio C Hamano
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
J
u
nio C
Hamano
Sync with 1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Git 1
.
7
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-23
Junio C Hamano
Merg
e
b
r
anc
h
'mg/use-default-
a
bbrev-length
-
in-rev-
l
ist
.
.
.
commit
|
commitdiff
|
tree
2010-04-23
Ju
n
io
C Hama
n
o
M
erge branch 'w
p
/doc-filter-direction' in
t
o main
t
commit
|
commitdiff
|
tree
2010-04-23
Junio
C
Hama
n
o
Mer
g
e branch 'jk/
m
a
int-diff
s
tat-overflow' in
t
o maint
commit
|
commitdiff
|
tree
2010-04-23
Jun
i
o
C Ham
a
no
Merge branch 'da/maint-pyth
o
n-
s
tartup' into maint
commit
|
commitdiff
|
tree
2010-04-22
Juni
o
C Ha
m
a
n
o
Mer
g
e bran
c
h
'maint'
commit
|
commitdiff
|
tree
2010-04-22
J
o
nat
h
an
N
i
e
der
Documentation/Makefile: fix interru
p
ted builds
of user
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
J
u
nio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-04-20
Michael
J Grube
r
t7012: Mar
k
mis
s
ing tests as
T
ODO
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-20
SZEDER Gá
b
or
reflog: remove 'show' fro
m
'expire's usage
string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
J
u
ni
o
C
Hama
n
o
M
er
g
e branch 'ma
i
nt-1
.
6
.
6' in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-04-19
Jo
h
annes Sixt
MS
V
C: Fix b
u
ild
b
y adding mis
s
ing te
r
mios
.
h d
u
mmy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Git
1
.
7
.
1-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge branc
h
'rr
/
re
m
o
te-h
e
lper-d
o
c'
commit
|
commitdiff
|
tree
2010-04-19
Junio
C
Hamano
Merge branch 'wp/d
o
c-
f
ilter
-
dire
c
t
ion'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge branch 'j
k
/m
a
int-
d
iffstat-ove
r
flow'
commit
|
commitdiff
|
tree
2010-04-19
Jun
i
o
C Hama
n
o
M
e
rge branch
'jg
/
auto-initialize-n
o
tes-with-per
c
en
t
.
.
.
commit
|
commitdiff
|
tree
2010-04-19
J
unio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-19
Junio C Hamano
Merge git:/
/
git
.
kernel
.
org/pub
/
scm/gitk/git
k
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ra
m
a
chandra
Do
c
u
mentati
o
n
/
re
m
ote-h
e
lpers: Fix
typ
o
s
a
n
d
impro
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
R
amk
u
mar R
a
m
ac
h
andra
Fixup: Second argum
e
nt m
a
y
b
e
any arbit
r
ary stri
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramkumar Ramachandra
Doc
u
men
t
ation/remote-helpers:
A
dd invoc
a
tion se
c
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramku
m
ar Rama
c
handra
D
o
c
u
mentation/urls: Rew
r
ite t
o
a
c
com
o
date <tr
a
nspor
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ramku
m
ar Ramach
a
n
dra
Do
c
u
ment
a
tion/remote-helpers: Rewrite
description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Char
l
es
B
a
i
ley
Documentation
:
De
s
cr
i
be other
situations where -z affects
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Jeff King
r
e
base-
i
nteract
i
v
e
:
silen
c
e war
n
ing when no commits
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-18
Ju
n
i
o
C H
a
mano
t3301: add tests
to use --format="%N"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Jun
i
o C Ha
m
ano
M
erg
e
b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2010-04-17
Matthew Ogilvi
e
t6006: do
no
t
write to /tmp
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Chris Webb
git-instaweb: pass through invoking
u
ser
'
s
path
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-17
Junio C Hamano
gitweb: simplify gitweb
.
min
.
*
g
e
ner
a
ti
o
n
an
d
clean
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
J
o
n
ath
a
n N
i
eder
tag -
v
:
use RU
N
_GI
T
_CMD
t
o run verify-tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Will Palmer
do
c
u
m
e
ntatio
n
: cla
r
ify direction of
c
ore
.
a
utoc
r
lf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
J
eff King
diff:
u
se large integ
e
rs for diffstat calculati
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Michael J
Gruber
t1010-mktree: Adjust expected re
s
ult to
c
ode and
d
ocumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-17
Th
o
mas Rast
combin
e
d di
f
f: corr
e
ctly handle truncated f
i
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nathan Nieder
Document new "alre
a
dy-mer
g
e
d" rule for branch -d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan N
i
eder
Add
.
depend directories to
.
gitig
n
ore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-14
Junio C Ham
a
no
Merge
bran
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2010-04-14
J
ohannes Gilger
prett
y
: Initia
l
ize notes if %N is used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-13
Jay Soffia
n
Documentation/co
n
fi
g
.
txt: def
a
ult gc
.
a
ggressiveWindow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-12
M
a
rc Br
a
nchaud
D
ocs: Add -X option to
g
i
t-merge's s
y
nop
s
is
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Junio
C
Hama
n
o
Merg
e
branch
'jl/maint-submodule-git
f
il
e
-awa
r
eness'
commit
|
commitdiff
|
tree
2010-04-11
Johanne
s
Sixt
Windows: start_command: Su
p
po
r
t non-NU
L
L dir in
s
truc
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
Sync with
1
.
7
.
0
.
5
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io
C
Hama
n
o
Merge branch '
j
c/doc-s
u
bmit-gmail'
commit
|
commitdiff
|
tree
2010-04-11
Jun
i
o C Hamano
Git 1
.
7
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Ju
n
io C H
a
mano
Me
r
ge branch 'rc/maint-reflog-msg
-
for-fo
r
ced-
b
ra
n
ch
.
.
.
commit
|
commitdiff
|
tree
2010-04-11
Junio C Hamano
b
la
m
e
documentation: -M/-
C
notice co
p
i
e
d lines a
s
wel
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-11
Stephen Boyd
t3507:
M
ake te
s
t executable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Git 1
.
7
.
1
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge branc
h
'm
r
/gitwe
b
-jsmi
n
'
commit
|
commitdiff
|
tree
2010-04-10
Junio C Hamano
Merge
br
a
nch 'j
l
/
maint-submodu
l
e-gitfile-aw
a
reness'
commit
|
commitdiff
|
tree
2010-04-10
Jen
s
Lehmann
T
eac
h
diff
--submodule and status to hand
l
e
.
git files
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C H
a
mano
Me
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-04-10
Jens Lehmann
Let
c
heck
_
preimag
e
(
)
u
s
e memset() to initia
l
ize
"struct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
J
u
nio C H
a
m
a
no
M
e
r
ge branch
'ef/maint-e
m
pty-co
m
mit-l
o
g' into ma
i
nt
commit
|
commitdiff
|
tree
2010-04-10
Junio C Ha
m
ano
M
e
rge branch 'jc/con
f
lict-marker-size' into main
t
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io C Hamano
Merge branch
'
sp/maint-htt
p
-
b
ackend-die-t
r
ig
g
ers-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
J
u
nio C Ham
a
n
o
Merge branch 'mg/maint-send-e
m
ail-lazy
-
e
ditor' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Ju
n
io C Ham
a
no
Merge
b
ranch 'rr/imap-send-uncon
f
use-from-
l
ine' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio
C Hamano
Merge
branch
'
rb/maint
-
python-path' i
n
to
maint
commit
|
commitdiff
|
tree
2010-04-10
J
u
nio C Hamano
Merge branch
'g
h
/maint-stash-show-error-messa
g
e' into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Junio C
H
amano
Me
r
ge
b
ranch
'mg
/
mailmap-
u
pdate' into maint
commit
|
commitdiff
|
tree
2010-04-10
Jun
i
o C Hamano
Merge branch 'bc/mai
n
t-daem
o
n-san
s
-ss-fa
m
ily
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-04-10
Tay Ra
y
C
h
uan
fetch/push: fix us
a
ge str
i
ngs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-10
Junio C
Hamano
Merge bra
n
ch '
r
c/maint-r
e
flog-msg-f
o
r-force
d
-
bran
c
h'
commit
|
commitdiff
|
tree
2010-04-10
Tay Ra
y
Ch
u
an
branch: say "Reset to" in reflo
g
entries for '
g
it branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-09
Ju
n
i
o
C
Hamano
Merge early parts of jk/ca
c
hed-te
x
tconv
commit
|
commitdiff
|
tree
2010-04-09
Junio C Hamano
diff
.
c: work
a
round
pointer constn
e
s
s
warnin
g
s
commit
|
commitdiff
|
tree
2010-04-09
Jun
i
o C H
a
man
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-04-08
Jeff King
docs: cla
r
ify
"
branch -l"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
Junio C Hamano
Submi
t
tingPatches: update GMail section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
J
u
nio
C
Hamano
Merge br
a
n
c
h
'mg/notes-refl
o
g'
commit
|
commitdiff
|
tree
2010-04-07
Junio C Ham
a
no
Merge branch
'jn/maili
n
fo-sc
i
sso
r
s'
commit
|
commitdiff
|
tree
2010-04-07
Jeff
King
fix ty
p
o
s
an
d
grammar in 1
.
7
.
1 draft releas
e
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-07
B
r
an
d
on Casey
notes
.
h
:
declare bit field as unsigned to silence
compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-06
Junio
C Hamano
Git 1
.
7
.
1-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merg
e
branc
h
'da/mai
n
t-python-startup'
commit
|
commitdiff
|
tree
2010-04-06
Junio
C
H
a
mano
Mer
g
e bra
n
ch '
i
c/bash-completi
o
n-rpm'
commit
|
commitdiff
|
tree
2010-04-06
J
u
nio
C
Hamano
M
e
rge branch 'sb/fmt-m
e
rge-msg'
commit
|
commitdiff
|
tree
2010-04-06
Junio
C
Ha
m
ano
Merg
e
bra
n
ch
'
j
c
/conflict-mark
e
r-size'
commit
|
commitdiff
|
tree
2010-04-06
Junio C Hamano
Merge
branch 'ef/mai
n
t-
e
mpty-commit-log'
commit
|
commitdiff
|
tree
2010-04-06
J
u
n
io C
Hamano
Merge
b
ran
c
h 'sg/bash-completion'
commit
|
commitdiff
|
tree
2010-04-05
Junio C Haman
o
Re
v
e
rt "L
i
nk ag
a
inst libicon
v
on IRI
X
"
commit
|
commitdiff
|
tree
2010-04-04
Junio C H
a
mano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray Chuan
pack
-
protoc
o
l
.
txt: fix pkt-lin
e
l
e
ngths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
T
ay Ray Chuan
p
ack-p
r
otoc
o
l
.
txt: fix sp
e
lling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan N
i
eder
Teach
mailinfo %< as
a
n alte
r
native sc
i
sso
r
s mark
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Mer
g
e b
r
anch 'mb/rebase-i-no-f
f
'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C Haman
o
M
erge br
a
nch 'sp/maint-http-backend-die
-
trigge
r
s
-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge b
r
anch '
r
r/imap-send-u
n
c
o
nfuse-from-line'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hama
n
o
Me
r
ge b
r
anch 'mg/use-defaul
t
-
abbrev-lengt
h
-in-rev-list'
commit
|
commitdiff
|
tree
next