repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: do not look at the index during recursive merge
2018-01-09
J
unio
C Hamano
merge-recursive: do not look at the in
d
ex
d
ur
i
n
g recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-22
Elij
a
h Newren
m
e
rge-rec
u
rsive: avoid incorporati
n
g uncommitted ch
a
nges
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
move in
d
ex_has_changes(
)
f
rom builtin/
a
m
.
c
to
m
erge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lij
a
h New
r
en
t6044: recursi
v
e ca
n
silently incorporate dirty
c
h
anges
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-06
J
u
n
i
o C Hamano
Pre
p
are f
o
r
2
.
15
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-06
Junio C Hamano
Merge bran
c
h 'jc/me
r
ge-b
a
se-fork-point-doc' into main
t
commit
|
commitdiff
|
tree
2017-12-06
Junio C Hamano
Merge branch 'tz/redi
r
ect-fix' into mai
n
t
commit
|
commitdiff
|
tree
2017-12-06
J
unio C
H
amano
Merge b
r
a
nch
'
t
z/no
t
es-error-
t
o-stderr' into maint
commit
|
commitdiff
|
tree
2017-12-06
J
u
nio C Hamano
M
e
rge b
r
anc
h
'sb/test-ch
e
rry-pick-submo
d
ule-ge
t
ting
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
Junio C
H
a
mano
Merge branch
'pw
/
s
equencer-recover-from-unlockab
l
e
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
Junio C
Haman
o
Mer
g
e branch 'rs/apply-inaccurate-eof-with-in
c
o
m
plete
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
J
u
n
i
o C Hamano
Merge
branc
h
'tz/complete-branch-copy
'
into maint
commit
|
commitdiff
|
tree
2017-12-06
Junio C Ham
a
no
Merge branch 'ew
/
rebase-mboxrd' into maint
commit
|
commitdiff
|
tree
2017-12-06
Junio C H
a
mano
Mer
g
e branch
'
s
d
/branc
h
-copy'
into
m
aint
commit
|
commitdiff
|
tree
2017-12-06
Junio C
Ha
m
ano
Me
r
ge br
a
nch 'sw/pul
l
-
ipv46-passthru' into main
t
commit
|
commitdiff
|
tree
2017-12-06
Junio
C
Hamano
Merge b
r
a
n
ch 'bc/submitting-patch
e
s-in-asc
i
idoc' int
o
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
Juni
o
C Hamano
M
e
rge b
r
anch
'
mh/avoid
-
rewrit
i
ng-packed-
r
efs' into
.
.
.
commit
|
commitdiff
|
tree
2017-11-28
J
uni
o
C Ham
a
no
Git 2
.
1
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-28
Junio C Hamano
M
e
rg
e
b
r
anc
h
'rs/
c
onf
i
g-write-section-fi
x
' i
n
to maint
commit
|
commitdiff
|
tree
2017-11-27
Junio C H
a
mano
A
bit
m
ore fixes for 2
.
15
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-27
Junio C Hamano
Merge br
a
n
c
h 'm
a
/reduce-heads-lea
k
f
ix' into
maint
commit
|
commitdiff
|
tree
2017-11-27
Junio C Hamano
Merge branch 'm
a
/bis
e
ct-le
a
kfix'
into ma
i
nt
commit
|
commitdiff
|
tree
2017-11-27
Juni
o
C Ham
a
no
Merge br
a
n
c
h 'rs/app
l
y-fuzzy-mat
c
h-fix'
in
t
o maint
commit
|
commitdiff
|
tree
2017-11-27
Junio C Hamano
M
erge b
r
a
n
ch '
a
d
/
submitting-patches-title-decoration
.
.
.
commit
|
commitdiff
|
tree
2017-11-27
Junio
C
Hamano
Mer
g
e branch
'
rs
/
im
a
p
-se
n
d-next-arg-fix' int
o
maint
commit
|
commitdiff
|
tree
2017-11-26
Todd Zullinger
RelNote
s
:
m
inor typo fixes in 2
.
15
.
1 d
r
aft
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-21
Junio C Hamano
Almost r
e
ady
f
or 2
.
1
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-21
Ju
n
io C Hamano
Me
r
ge branch 'rs/sequencer-rewrite-file-cleanu
p
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-11-21
Jun
i
o C
Hamano
Merge bran
c
h 'cb/
t
4201-robust
i
fy' into maint
commit
|
commitdiff
|
tree
2017-11-21
Ju
n
io C Ha
m
ano
Merge branch
'tz/fsf-address
-
update' into maint
commit
|
commitdiff
|
tree
2017-11-21
J
unio
C
Ha
m
ano
Merge branch
'ad/rebase
-
i-se
r
ie-typofix' into
m
aint
commit
|
commitdiff
|
tree
2017-11-21
Junio
C
Haman
o
Me
r
ge branch 'jk/inf
o
-a
l
ternates-f
i
x' i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2017-11-21
Junio C Ha
m
ano
M
e
rge bra
n
ch
'ab/
p
cre-v
2
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2017-11-21
Junio C Hamano
M
erge branch 'sr/wrapper-quote-filenames' int
o
maint
commit
|
commitdiff
|
tree
2017-11-21
Junio C Hama
n
o
Merg
e
b
ranch 'bw/rebase
-
i-i
g
nored-sub
m
odul
e
-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-11-21
Shuyu Wei
pull:
p
ass -4/-6 option
to
'
git fe
t
c
h'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-18
René Scharfe
c
o
nfig: flip return value of write_section()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-18
Eric
W
ong
reba
s
e
: u
s
e mboxrd format to
avoid split errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-17
René Scharfe
apply: upd
a
t
e
line lengths
for --inacc
u
rate-eof
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-17
T
o
dd Zullinger
complet
i
on: add '--copy'
o
ption to 'git bra
n
ch'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-16
Phillip Wood
sequ
e
ncer: reschedule pick i
f
index can'
t
be locked
commit
|
commitdiff
|
tree
2017-11-16
P
hillip Wood
config
:
avoid "
w
r
i
te_in_ful
l
(fd
,
b
u
f,
len) != len"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-15
El
i
jah
Newre
n
merge-re
c
ursive: hand
l
e ad
d
i
t
ion
o
f s
u
bmodule on our
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-15
J
u
nio C Hama
n
o
S
tart
p
reparation for 2
.
15
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-15
Jun
i
o
C Hamano
Merge branch 'k
s
/mailma
p
' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C H
a
man
o
M
e
rg
e
branch 'jm/re
l
notes-2
.
15-typofix' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C H
a
m
ano
Merge
branch 'cn/diff-indent
-
no-long
e
r-is-exp
e
rimental
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Jun
i
o C Ha
m
ano
Merge b
r
anch 'js/min
g
w-redi
r
ect-s
t
d
-handl
e
s
' int
o
maint
commit
|
commitdiff
|
tree
2017-11-15
Jun
i
o C Hamano
Mer
g
e
b
r
a
nch 'js/wincred-empty-c
r
ed
'
into
m
aint
commit
|
commitdiff
|
tree
2017-11-15
Junio C Haman
o
M
e
rge br
a
nch
'
js/mingw
-
full-version-in-r
e
sources
'
into
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
J
u
nio C Hama
n
o
Merge
b
r
a
nch 'dk/libsec
r
e
t-unlock-to-load-fix' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge branch 'js/earl
y
-config' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
M
erge branch
'ad
/
5580-unc-tests-on
-
c
y
gwin' into maint
commit
|
commitdiff
|
tree
2017-11-15
J
u
ni
o
C
Hamano
Merge bra
n
ch 'a
o
/di
f
f
-
populate-files
p
ec-lstat-err
o
rpath
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Jun
i
o C Haman
o
Merge branch 'sb/b
l
a
me-confi
g
-doc' into
m
aint
commit
|
commitdiff
|
tree
2017-11-15
Junio
C Hamano
Merge branch 'tb/comple
t
e
-
c
heckout' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2017-11-15
Junio C
Hamano
Mer
g
e br
a
nch 'jc/check-ref
-
format-oor' into main
t
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge
branch 'jc
/
t5601-copy-worka
r
o
u
nd' into maint
commit
|
commitdiff
|
tree
2017-11-15
J
u
nio
C
Hamano
Merge branc
h
'jk/re
b
ase-
i
-ex
e
c-gitdir-fix'
i
nto maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C
Ha
m
ano
Merge
b
r
anch 'bw/grep-recurse-submodules
'
i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge bran
c
h 'js/submo
d
ule-in-exclu
d
ed' in
t
o maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge branch '
a
o
/
check-resolve-ref-
u
nsafe-resul
t
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merg
e
branch 'jk/
m
isc-resolve-
r
ef
-
unsafe-fixe
s
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C
Hamano
M
erge branch
'
sb/
d
iff-color-moved-use-xdl
-
r
e
cmatch
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
J
u
nio
C
H
a
mano
Merge branch
'
j
k/diff-color-mov
e
d-fix' in
t
o m
a
int
commit
|
commitdiff
|
tree
2017-11-15
Junio C
H
a
ma
n
o
Merge branch 'k
d
/
a
uto-col-
w
ith-pager-fi
x
' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge bra
n
c
h
'sg/travis
-
fixes' into maint
commit
|
commitdiff
|
tree
2017-11-15
Todd Zu
l
linger
notes: send "Automatic notes me
r
ge f
a
iled"
m
es
s
ages
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-14
Todd Zullinger
rebase: fix
stderr redirec
t
i
n
appl
y
_autostash()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-14
Todd Zull
i
nge
r
t/lib-gpg
:
fix gpgcon
f
stderr redire
c
t
t
o /dev/nu
l
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-13
Jef
f
King
link_a
l
t_odb_entri
e
s: make
e
mpty in
p
ut
a
noop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-13
bri
a
n
m
.
carl
s
on
Do
c
ument
a
ti
o
n: convert SubmittingP
a
tches to
A
s
c
iiDoc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-13
Charles
Bailey
g
rep: fix N
O
_
LI
B
PCRE1_JIT t
o
fully disab
l
e
J
I
T
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-13
Char
l
es Bailey
t4201: m
a
k
e
use o
f
a
bbreviation in the test mo
r
e robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-12
Stefan B
e
lle
r
t
/
35
1
2: demonst
r
a
te unr
e
la
t
ed
s
ubmo
d
ule/file confl
i
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-12
René Schar
f
e
a
p
ply: avoid o
u
t-of-bounds access
in fuz
z
y_matchlines()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-10
Adam Dinwoodie
doc/
S
ubmit
t
ing
P
a
tches: correct subjec
t
g
u
ida
n
ce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-09
Junio C Ham
a
no
Mer
g
e branc
h
'tz/fsf
-
a
d
dress-update' of
.
.
/
git
-
gui
.
.
.
commit
|
commitdiff
|
tree
2017-11-09
T
odd Zulling
e
r
Repl
a
ce Free Software Foundation addre
s
s in license
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-09
Todd
Z
ullinger
R
e
p
l
a
c
e Free S
o
ftware Fo
u
ndation ad
d
ress
i
n lic
e
n
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-09
Adam
D
inwoo
d
ie
r
e
ba
s
e -i: fix comment typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-09
Junio C H
a
ma
n
o
mer
g
e-ba
s
e --
f
ork-point doc: clar
i
fy the example an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-08
Martin Å
g
ren
r
ed
u
ce_heads: fix memo
r
y
l
e
a
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-08
Martin
Ågren
b
uiltin/merge-base: free commit lists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-07
B
r
an
d
on W
i
lliams
w
t
-stat
u
s: actually igno
r
e s
u
b
m
o
dules when
r
equ
e
s
t
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
Simon R
u
derich
wrapper
.
c
: consistent
l
y quote f
i
le
n
ames
i
n error
messa
g
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
Jean
Carlo Machado
fix ty
p
os in
2
.
15
.
0 release
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
Marti
n
Åg
r
en
bisect: fix memory lea
k
when re
t
ur
n
ing bes
t
element
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
Ma
r
t
i
n
Ågren
bisect: fi
x
o
f
f
-by
-
one
e
rror
i
n
`best_bi
s
ection_sor
t
ed()`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
Martin Ågren
b
ise
c
t: fix memory leak
i
n `f
i
nd_bis
e
ction()`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
Martin Ågren
bi
s
ect: change calli
n
g
-
convention of `f
i
nd_bisection()`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
Stefan Beller
config: document bl
a
me configurat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-04
Denni
s
Kaarsema
k
er
cred
e
ntia
l
-libsecret: unlock locked secrets
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-03
Jeff
K
ing
s
etup: avoid
double sl
a
s
h
es
w
h
en looking f
o
r HEAD
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-03
Kaartic Sivaraam
mailma
p
:
use Kaartic Sivar
a
am's new address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-03
René Scharfe
i
m
ap-s
e
nd: handle missing response codes
g
racefully
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-03
René Scharfe
imap-send:
h
andle
NULL return of ne
x
t_arg()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-02
Carlos
Martín Nieto
d
i
ff: --ind
e
nt-he
u
ristic i
s
no
l
onger experim
e
nta
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-02
Sim
o
n Ruderich
sequencer
.
c: check return valu
e
of c
l
o
s
e() in rewrite_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-02
Johann
e
s Schinde
l
in
mingw
:
doc
u
ment th
e
standa
r
d handle redirecti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next