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
t6044: recursive can silently incorporate dirty changes in a merge
2017-12-22
Elijah
N
e
w
r
en
t60
4
4: recursive can silently incorpora
t
e dirty change
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-06
Junio C Ha
m
ano
Prepare for 2
.
1
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-06
Junio C
Ha
m
ano
Merge b
r
anch 'jc/merge
-
base-fork-point
-
doc' into maint
commit
|
commitdiff
|
tree
2017-12-06
Junio C Hamano
Merge b
r
anch 'tz/redire
c
t-fix'
i
nt
o
maint
commit
|
commitdiff
|
tree
2017-12-06
Junio C Hama
n
o
Merge branch 'tz/notes-
e
rro
r
-to-stderr' in
t
o maint
commit
|
commitdiff
|
tree
2017-12-06
J
unio
C
H
amano
Merge branch
'sb/test
-
cherry-p
i
ck-submodule-getting
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
Junio C Hamano
Merge branch
'pw/sequencer-recover-f
r
om-u
n
lockable
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
J
uni
o
C
H
a
m
a
no
Merge branch
'
rs/apply-inaccurate-eof-with-incomplet
e
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
Junio C Hama
n
o
Merge branc
h
'
t
z
/complete-branch-copy' into main
t
commit
|
commitdiff
|
tree
2017-12-06
Junio C Hamano
Merge br
a
nch 'ew/rebas
e
-mboxrd' into maint
commit
|
commitdiff
|
tree
2017-12-06
Junio
C
H
a
ma
n
o
Me
r
g
e
b
r
anch 'sd/branch-copy' in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2017-12-06
J
u
nio C H
a
mano
Me
r
ge branc
h
'
s
w/pull-ipv
4
6-pass
t
hru' into m
a
int
commit
|
commitdiff
|
tree
2017-12-06
Junio C
H
am
a
n
o
Me
r
g
e branch 'bc/submitt
i
n
g
-patc
h
e
s-in-
a
sciido
c
' into
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
J
uni
o
C Hamano
Merg
e
b
ranch 'mh/a
v
oid-rewriting-pa
c
ked-re
f
s' into
.
.
.
commit
|
commitdiff
|
tree
2017-11-28
J
u
n
io C Haman
o
Git 2
.
1
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-28
Junio C H
a
mano
Merge branch 'rs/config-write
-
sec
t
ion-fix' into maint
commit
|
commitdiff
|
tree
2017-11-27
Junio
C
Hama
n
o
A
b
i
t more fixes for 2
.
1
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-27
J
unio C Hamano
M
e
r
g
e
branch 'ma/reduce-heads-leakf
i
x
' into maint
commit
|
commitdiff
|
tree
2017-11-27
Junio C Hamano
Merge b
r
anch 'ma/b
i
sect
-
leak
f
ix' into ma
i
nt
commit
|
commitdiff
|
tree
2017-11-27
Jun
i
o
C
Hamano
Merge branch 'rs/apply-fuzzy-m
a
tch-fix'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2017-11-27
J
u
n
i
o C H
a
m
a
no
M
e
rge
b
ranch 'a
d
/submitting-p
a
tches
-
title-decoratio
n
.
.
.
commit
|
commitdiff
|
tree
2017-11-27
Junio C Ha
m
ano
Merge
branch '
r
s/imap-send-next-ar
g
-fix' into maint
commit
|
commitdiff
|
tree
2017-11-26
Todd Zul
l
inger
RelNotes: minor
t
y
po
f
ixe
s
i
n 2
.
15
.
1 dra
f
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-21
J
unio
C
H
amano
A
l
most ready for 2
.
15
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-21
Ju
n
io C Haman
o
Merge br
a
nch 'rs/sequencer-r
e
write-fi
l
e-cleanup' into
.
.
.
commit
|
commitdiff
|
tree
2017-11-21
Junio C Hamano
Mer
g
e branch
'
cb/t4201-robu
s
tif
y
' in
t
o m
a
int
commit
|
commitdiff
|
tree
2017-11-21
Junio
C
Ha
m
a
n
o
Mer
g
e branch 'tz/fsf-ad
d
ress-update'
i
nto maint
commit
|
commitdiff
|
tree
2017-11-21
Junio
C
H
a
m
ano
Merge branch 'a
d
/re
b
a
se
-
i-serie-typofix' into maint
commit
|
commitdiff
|
tree
2017-11-21
J
unio C
H
amano
M
e
rg
e
branch 'jk/info-a
l
te
r
nates-fix' into maint
commit
|
commitdiff
|
tree
2017-11-21
Junio C Ham
a
no
Merge branch
'ab/p
c
re-v2' into mai
n
t
commit
|
commitdiff
|
tree
2017-11-21
Ju
n
io C Ha
m
ano
Me
r
ge branch 'sr/wrap
p
er-quo
t
e-fil
e
na
m
e
s
'
into m
a
int
commit
|
commitdiff
|
tree
2017-11-21
Jun
i
o
C Ha
m
ano
Mer
g
e bran
c
h
'bw/rebase-i-i
g
nored-submodule-fix' into
.
.
.
commit
|
commitdiff
|
tree
2017-11-21
Shuyu Wei
pull: pass -4/-6 opt
i
on to 'git fetch'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-18
Ren
é
S
charf
e
config:
f
li
p
retur
n
value of w
r
i
te
_
section()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-18
Eric Wong
rebase
:
use m
b
ox
r
d
f
o
rm
a
t
t
o
avoid split errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-17
René Scharfe
appl
y
: update line
lengths for -
-
i
naccurate-eof
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-17
T
o
dd Zull
i
nger
c
ompl
e
tion:
a
dd '-
-
co
p
y'
option t
o
'g
i
t branch'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-16
Philli
p
Woo
d
sequencer:
r
esc
h
e
d
u
le pick if index
can't
be
l
o
c
ked
commit
|
commitdiff
|
tree
2017-11-16
P
hillip Wood
conf
i
g:
a
vo
i
d "
w
r
ite_in
_
f
ul
l
(fd, buf, len) != l
e
n"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah N
e
wren
me
r
g
e-rec
u
rsive: handle add
i
ti
o
n of submodu
l
e on our
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
S
t
a
rt prepar
a
tion for
2
.
15
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-15
Junio
C
H
amano
Mer
g
e
branch 'ks/mailmap' into
m
a
int
commit
|
commitdiff
|
tree
2017-11-15
J
unio C Hamano
Merge branc
h
'jm/relnote
s
-2
.
1
5
-
typofix' into maint
commit
|
commitdiff
|
tree
2017-11-15
J
unio C Hamano
Merge branch
'
cn/diff-indent-no-lon
g
er-is-experiment
a
l
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Ha
m
a
n
o
Me
r
ge bran
c
h
'js/mingw-redirect-std-handl
e
s' into m
a
i
n
t
commit
|
commitdiff
|
tree
2017-11-15
Ju
n
io C Hamano
Merge branch 'js/wincred-e
m
pty-cred' into m
a
int
commit
|
commitdiff
|
tree
2017-11-15
J
u
nio
C
Ham
a
no
Merge b
r
anch 'js/mi
n
gw-full-vers
i
on
-
in-resources' into
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Juni
o
C Haman
o
Merge
b
ranch 'dk/libsecret-unloc
k
-to-load-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge bra
n
ch 'js/early-confi
g
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge branch '
a
d/5580
-
un
c
-tes
t
s-on-cygwin' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C Ha
m
ano
Merge bra
n
c
h
'
ao/
d
i
f
f
-
p
opulate-f
i
les
p
ec-ls
t
at-erro
r
path
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge branch 'sb
/
blame
-
c
o
nfig-
d
o
c
'
int
o
maint
commit
|
commitdiff
|
tree
2017-11-15
Junio
C
Hamano
Merge branch 'tb/comp
l
ete-c
h
ecko
u
t' i
n
to maint
commit
|
commitdiff
|
tree
2017-11-15
Juni
o
C Hama
n
o
Merge branch 'jc/check-ref-format-oo
r
' into maint
commit
|
commitdiff
|
tree
2017-11-15
J
u
ni
o
C Haman
o
Merge branch 'jc/t
5
6
0
1-cop
y
-workaround' into maint
commit
|
commitdiff
|
tree
2017-11-15
J
unio C H
a
mano
Merge branch 'jk/r
e
b
a
se-i-exec-gitdir-fix' in
t
o maint
commit
|
commitdiff
|
tree
2017-11-15
Ju
n
io C
Hamano
Merge
branc
h
'bw/grep
-
recurse-submo
d
ules
'
i
nto maint
commit
|
commitdiff
|
tree
2017-11-15
Juni
o
C H
a
m
ano
Me
r
ge branch 'js/su
b
module-in-e
x
cluded' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2017-11-15
Juni
o
C Ha
m
a
n
o
Merge b
r
a
n
ch 'ao/check-res
o
lve-ref-unsa
f
e-result' into
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge bra
n
ch
'jk
/
mi
s
c-resolve
-
ref-unsafe-fixes'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge
b
ran
c
h 's
b
/diff-color-mov
e
d-use-
x
dl-
r
ecmatch
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio
C
Hama
n
o
Merge
b
ranch
'jk/diff-c
o
lo
r
-mov
e
d-f
i
x' i
n
t
o
maint
commit
|
commitdiff
|
tree
2017-11-15
Junio
C
Hamano
M
erge branc
h
'kd/auto-col
-
w
i
th-pager-fix' into ma
i
n
t
commit
|
commitdiff
|
tree
2017-11-15
J
u
nio C Hamano
Mer
g
e branch 'sg/t
r
avis-fixes' into maint
commit
|
commitdiff
|
tree
2017-11-15
Todd Zulli
n
ger
n
o
t
es: send "Automatic notes merge failed" mes
s
ag
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-14
T
o
d
d
Zullinger
rebase: fix std
e
rr re
d
irect i
n
apply_autostash()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-14
Todd Zullinger
t/lib-gpg: fix g
p
gconf st
d
err redirect
t
o /dev/null
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-13
Jeff King
link_alt
_
odb_entrie
s
: ma
k
e empty
i
n
put a noop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-13
bria
n
m
.
carlso
n
Doc
u
mentation: convert Su
b
mittingP
a
tch
e
s to AsciiDoc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-13
Charles Bailey
grep
:
fi
x
N
O_LIBPCRE
1
_JIT to fully disable
J
IT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-13
Charles Bai
l
ey
t42
0
1: make us
e
o
f abbrevia
t
i
on in the test more rob
u
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-12
Stefa
n
Beller
t
/
3512: d
e
monstr
a
te unrelated submodule/file conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-12
René Sc
h
arfe
a
pply: avoid out-of-bounds a
c
cess in fuzzy_matchline
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-10
Adam Dinwoodie
d
o
c
/
Submi
t
tingPatches: co
r
rect subje
c
t
guidance
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-09
Junio C Haman
o
Merge branch
'tz/
f
sf-address-u
p
d
ate' of
.
.
/git-gui
.
.
.
commit
|
commitdiff
|
tree
2017-11-09
T
odd Zu
l
l
inger
Replace Free Software Foundation a
d
dress in license
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-09
Todd
Z
u
l
linger
Replace F
r
e
e
Soft
w
are Foundatio
n
address
in licen
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-09
Adam
Dinwo
o
die
rebase -
i
: f
i
x comme
n
t ty
p
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-09
Jun
i
o C
Hamano
merge-ba
s
e --f
o
rk-point
doc
:
cl
a
rify the example
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-08
M
a
rtin Ågren
r
e
duce_heads:
fix memory
l
eaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-08
Martin
Ågren
bu
i
ltin/merge
-
base: fr
e
e c
o
mmi
t
lists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-07
Brandon Willia
m
s
wt-status: act
u
al
l
y ig
n
ore submodules w
h
en r
e
q
u
ested
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
S
im
o
n Ruderich
wrapper
.
c: cons
i
st
e
ntly quote filenames in error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
Jean C
a
rlo Machado
fix
t
ypo
s
in 2
.
15
.
0 release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
Mar
t
in Ågren
b
ise
c
t: fix
m
em
o
ry leak
when r
e
t
urn
i
ng best
e
lement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
Martin Ågren
bisect: fix off-by-one e
r
ror
in `b
e
st_bis
e
ction_sorted()
`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
M
a
r
t
i
n
Ågren
bisect: fix memory leak in `
f
ind_bi
s
e
ction()`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
M
a
r
t
i
n Ågren
b
i
sect: c
h
ange calling-conven
t
i
o
n of `find_b
i
section()`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-06
S
t
ef
a
n Beller
config: do
c
ume
n
t blam
e
config
u
ration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-04
Dennis K
a
a
rsemake
r
cred
e
ntial-l
i
bsecret
:
unlock
locked secret
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-03
Jeff King
setup: avoid double slashes w
h
en lookin
g
for HEA
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-03
Kaa
r
tic Sivaraam
mailmap
:
use Kaar
t
ic
S
ivaraam'
s
new ad
d
ress
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-03
René Scharfe
imap-sen
d
: handle missi
n
g
response
c
odes gracefully
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-03
René
Scharf
e
im
a
p-
s
end: han
d
le NULL return o
f
next_ar
g
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-02
C
a
rlos Martín Nieto
dif
f
: --indent-heuristic
i
s no longer
experiment
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-02
Simon
Ruderich
sequencer
.
c:
c
heck return valu
e
o
f
close() in r
e
write_file(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-02
Johannes Schindelin
mingw: document the stan
d
ard han
d
le red
i
rectio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-02
Johannes Schindelin
mingw:
o
ptionally redir
e
ct s
t
derr/st
d
out via the same
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-02
Johannes
Schindelin
mingw:
add
experi
m
ental feature t
o
re
d
irect standard
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-11-02
SZEDER Gábor
travis-ci:
d
on't bu
i
ld Git
for the static an
a
lys
i
s job
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next