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
rerere: recalculate conflict ID when unresolved conflict is committed
2018-08-06
T
h
omas Gu
m
merer
rere
r
e: recalcu
l
ate c
o
nflict I
D
when
un
r
esolved
c
onf
l
ict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gummerer
rerere: te
a
ch r
e
rere to handle nested co
n
flicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gumme
r
er
r
er
e
re: return strbuf from handle path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas
G
u
mmerer
re
r
ere: f
a
ctor out handle_conflict
f
unc
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
T
h
oma
s
Gummerer
r
erer
e
: onl
y
return whet
h
er a pa
t
h has conflicts
o
r not
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thom
a
s Gu
m
merer
rerere: fix cra
s
h w
i
t
h
f
il
e
s rerer
e
can't handle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gu
m
merer
re
r
er
e
: add documen
t
ation for conflict normaliz
a
ti
o
n
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thom
a
s G
u
mme
r
er
rerere: ma
r
k st
r
ing
s
for trans
l
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gummerer
rerere:
wrap paths in output in sq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gummerer
rerer
e
: lowercase error messa
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-07-16
Thoma
s
Gummerer
r
erere: uni
f
y error me
s
s
a
ges when r
e
ad_cach
e
fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Second batch for 2
.
19 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hama
n
o
Merg
e
b
r
anch 'sb/fix-fetching-moved-submodu
l
es'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C Hamano
M
erge
b
r
anch
'
t
z/
c
red-netrc-cl
e
anup'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merge
b
ranch
'
jc/clean-
a
f
t
er-sanity-tests'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Me
r
ge branch 'n
d
/completio
n
-negati
o
n
'
commit
|
commitdiff
|
tree
2018-06-28
Junio C H
a
mano
Merge branch 'pw/ad
d
-p-re
c
o
u
nt'
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C Ha
m
a
n
o
Merge branch 'jk/f
e
tch-
a
ll
-
peeled-fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merge
branch 'ms
/
s
end
-
pack-honor-config'
commit
|
commitdiff
|
tree
2018-06-28
J
un
i
o
C
H
a
mano
Merge b
r
anc
h
'jh/partial-c
l
one'
commit
|
commitdiff
|
tree
2018-06-28
J
unio C Hamano
Merge branch 'sg
/
gpg-tests
-
fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C H
a
mano
Merge branch 'a
s
/
saf
e
crlf-
q
uie
t
-fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C
Ham
a
no
Merge branch 'ab/ref
s
pec-
i
nit-fix'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Haman
o
F
i
rst batch for
2
.
19 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C
H
a
m
ano
M
e
rge branch 'sb/plug-misc-leak
s
'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
Hama
n
o
Mer
g
e
br
a
nch 'cc/tests-without-
a
s
s
uming-ref-f
i
l
es-backend'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Ham
a
no
Merge b
r
anc
h
'sg/upd
a
te-ref-stdi
n
-cleanu
p
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C H
a
mano
Merge
b
r
a
nch
'
nd/reject
-
emp
t
y-sh
a
llow-request'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Hamano
Me
r
ge branch 'ls/complete-rem
o
te-u
p
date-nam
e
s
'
commit
|
commitdiff
|
tree
2018-06-25
J
u
n
io
C Hamano
M
e
rg
e
branch 'a
g
/
r
eb
a
s
e
-
p'
commit
|
commitdiff
|
tree
2018-06-25
J
unio C Hamano
M
erge branch 'nd/com
p
lete-config-var
s
'
commit
|
commitdiff
|
tree
2018-06-25
J
unio C
Hamano
Me
r
ge branc
h
'sb/obje
c
t-store-alloc'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Mer
g
e branch
'jk/show-in
d
ex'
commit
|
commitdiff
|
tree
2018-06-25
J
u
n
i
o C Hamano
Merge branch 'en/merg
e
-rec
u
rsive-t
e
sts'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o
C H
a
mano
Merge branch 'nd/diff-apply-ita'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C Hamano
M
erge branch 'ds/commit-graph-lockfile-fix'
commit
|
commitdiff
|
tree
2018-06-25
J
u
nio C
Haman
o
Me
r
ge branch 'nd/
c
o
mmit
-
util-to-slab'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
amano
M
erge branch 'pc
/
submod
u
le-helper-
f
oreac
h
'
commit
|
commitdiff
|
tree
2018-06-25
J
unio C H
a
mano
Prepare to st
a
rt 2
.
1
9
cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-25
S
t
efan Beller
seque
n
ce
r
.
c: plug mem leak in git_se
q
uenc
e
r
_
c
onf
i
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-21
Junio C
H
amano
Git 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
Junio C Hamano
Me
r
ge
branch 'en/rename-d
i
rector
y
-dete
c
tion-r
e
boo
t
'
commit
|
commitdiff
|
tree
2018-06-19
Juni
o
C
Hamano
Merge tag 'l10n
-
2
.
18
.
0-rnd3
.
1' of git:/
/
g
i
thub
.
com
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
Ju
n
io C Hamano
Merge
b
r
anch
'
c
f/s
u
b
module-pro
g
res
s
-dissociate'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Ha
m
ano
Me
r
ge bran
c
h 'js
/
rebase-i
-
root-fix'
commit
|
commitdiff
|
tree
2018-06-19
Stefan
B
e
ller
t7400: encaps
u
late
setup co
d
e
in test_expect_success
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
Tod
d
Zullinger
t34
0
4: check
r
oot commit in
'
r
e
base
-i
--root
r
e
w
ord
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
Karthikeyan S
i
ngaravelan
d
oc: fix typos in documentation a
n
d relea
s
e notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Todd Z
u
llinger
git-credent
i
a
l
-netrc: m
a
ke "all" default target of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Almost 2
.
18
f
inal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch 'e
s
/make-no-ico
n
v'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
Hamano
Merge br
a
nc
h
'sg/t7406-chain-fi
x
'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C
Hamano
Merg
e
b
r
a
nch 'ks/b
r
anch-set-upstream'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
Hamano
Merge
b
ranch '
j
s/rebase-i-root-
f
ix
'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Hamano
Merg
e
bran
c
h 'jk/ewah-bounds-c
h
e
c
k'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
mano
Merge tag
'
l10n-
2
.
18
.
0-r
n
d3' of gi
t
://
g
ithub
.
co
m
/gi
t
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
H
a
mano
A bunch of mic
r
o-fixes before going 2
.
18 final
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ha
m
ano
Me
r
g
e
branch 'sb/bl
a
me-c
o
lor'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Ha
m
ano
M
e
r
g
e branch 'm
w
/doc
-
merge-enumfix'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C
H
amano
Merg
e
b
r
anch
'
en/
r
ena
m
e-directory-
d
etection'
commit
|
commitdiff
|
tree
2018-06-18
J
u
ni
o
C Hamano
Merge
b
ranch 'rd
/
doc-rem
o
te-tr
a
cking-
w
ith-hyph
e
n'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
i
o C Hamano
Merge bran
c
h
'jl/zl
i
b-re
s
tore-nul-ter
m
ination'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o
C Hamano
Merge branch
'
ab/cred-netrc-no-autod
i
e'
commit
|
commitdiff
|
tree
2018-06-18
J
u
ni
o
C
Hamano
Merg
e
b
ran
c
h
'km/doc-workflows-typ
o
f
ix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch 'ld/git-p
4
-update
s
'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
e
r
g
e branch 'rd/d
i
ff-opt
i
ons-typofix'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hamano
Merge br
a
nch 'rd/commen
t
-
typofix-in-sha1-file'
commit
|
commitdiff
|
tree
2018-06-18
René
S
char
f
e
merge-re
c
ursi
v
e: use xstrdup() instead of fixed
b
uffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
SZED
E
R Gábor
RelNotes 2
.
18: minor fix t
o
entry about
d
ynamically
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER Gábor
t7406-
s
ubmodul
e
-update:
f
ix br
o
ken &&-chain
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Joha
n
nes
S
c
hindelin
rebase --root:
f
i
x amending
root commit messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Todd
Z
u
llinger
rebase --
r
o
ot
:
demons
t
rate a b
u
g
w
hile amending root
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jeff Ki
n
g
ewah: adj
u
st callers of ewa
h
_
r
ead_mmap()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jeff King
ewah_re
a
d
_mmap:
b
ounds-ch
e
ck mmap reads
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Kaartic Sivaraam
t320
0
: clarify description o
f
--se
t
-upstream test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Lu
i
s Ma
r
s
a
no
g
i
t-creden
t
ial
-
n
etrc: fix e
x
it
s
tatus
w
hen
t
e
sts fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Lui
s
Ma
r
sano
g
it-credential-netrc:
use
i
n-tree
Git
.
p
m
f
o
r t
e
sts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zu
l
linger
gi
t
-credential
-
netrc: mino
r
wh
i
tespace cleanup
i
n te
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-15
Eric
S
u
nshine
M
a
kefil
e
:
m
a
ke NO_ICONV
r
eal
l
y mean "no iconv"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-15
Junio C Ha
m
ano
te
s
ts: clean a
f
ter SANITY tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Ste
f
a
n
Beller
t5526: test recu
r
sive submodules
w
hen fetching
m
oved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Stefan B
e
l
l
er
s
ubmo
d
ule: fix NULL correc
t
n
e
ss i
n
r
enam
e
d br
o
ke
n
submodul
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Men
g
-Sung Wu
doc
:
update the order of
the syntax `
g
it me
r
ge
-
-c
o
nti
n
ue
`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
René Scharfe
blame:
r
elease str
i
ng_l
i
st after use i
n
pars
e
_color_f
i
e
lds()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Re
n
é
Scharfe
merge-recursi
v
e: use xstrdup() in
s
te
a
d of fixed buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Juni
o
C
Hamano
Git 2
.
18-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Junio C Haman
o
Merg
e
branch '
j
k/in
d
e
x
-
pack-m
a
int'
commit
|
commitdiff
|
tree
2018-06-13
J
u
nio C Ha
m
ano
Mer
g
e
b
ran
c
h 'sg/completion-zsh-wor
k
aro
u
nd'
commit
|
commitdiff
|
tree
2018-06-13
J
uni
o
C Hamano
Merge branch 'sb/submodule
-
m
e
r
g
e-in-merge-
r
e
c
u
r
s
i
ve'
commit
|
commitdiff
|
tree
2018-06-13
Jun
i
o C
H
am
a
no
Me
r
g
e branch 'jk/submodule-fsck-lo
o
s
e
-f
i
xup'
commit
|
commitdiff
|
tree
2018-06-13
Kirill Smelkov
fetch-
p
ack: test explicitly that --all
can fetch tag
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Jeremy Linton
p
a
c
kfile: correct zlib buffer
h
an
d
lin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newre
n
RelNotes 2
.
18: clarif
y
where d
i
recto
r
y renam
e
d
etection
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Robert P
.
J
.
Day
U
s
e hyph
e
nated "remote
-
tracking
branch" (docs an
d
comments)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Æ
v
a
r Arn
f
jörð Bjarmason
gi
t
-credential-netrc: remo
v
e use of "autodie"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
git-p4:
a
uto-size th
e
block
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
L
uke
D
i
amand
g
i
t-p4
:
narrow the s
c
ope of ex
c
eptions c
a
u
ght when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luk
e
Di
a
mand
git
-
p4: rais
e
ex
c
eption
s
from p4Cm
d
List based on erro
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
git-p4
:
bet
t
er error
r
eporting
when p4 f
a
ils
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke Dia
m
and
g
i
t-p4: add op
t
ion
to
disable
s
yncin
g
of p4/
m
aster
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next