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: teach rerere to handle nested conflicts
2018-08-06
Thomas Gummerer
rerere:
teach rerere to handle
n
e
sted con
f
l
i
cts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gumme
r
er
re
r
ere: ret
u
rn st
r
buf from handle
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas Gum
m
ere
r
rerere: f
a
ctor out handle_conflict
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Tho
m
as Gu
m
merer
rerere: onl
y
retu
r
n whether
a path has conflicts or no
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Th
o
ma
s
Gummerer
rerere: fix cr
a
sh with files r
e
rere can't handle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
T
h
omas Gummerer
rerere: add do
c
umentation for conflict normalization
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-08-06
Thomas G
u
mmerer
r
e
rere: mark strings for tran
s
l
a
ti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-07-16
T
h
o
mas Gumm
e
rer
re
r
ere: wra
p
path
s
in
outpu
t
in sq
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-07-16
T
homa
s
Gummer
e
r
rerere: lowercase
e
rror m
e
ssages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-07-16
Thomas G
u
mmerer
rerere: unif
y
error messag
e
s when read_cach
e
fa
i
ls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-28
Junio C Haman
o
Sec
o
nd bat
c
h for 2
.
1
9
cycl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merge branch 'sb/fix-fetching-
m
ove
d
-su
b
modules'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merg
e
branch 'tz/c
r
ed
-
netrc-cleanup
'
commit
|
commitdiff
|
tree
2018-06-28
Junio
C
Hamano
Mer
g
e
branch 'jc/clean-after
-
sa
n
ity-t
e
sts'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C Ha
m
ano
M
erge br
a
nch 'nd/completion-negation'
commit
|
commitdiff
|
tree
2018-06-28
Junio C H
a
mano
Merg
e
bra
n
c
h
'pw/add-p-recount'
commit
|
commitdiff
|
tree
2018-06-28
Junio
C
H
a
ma
n
o
Mer
g
e
branch 'jk/
f
etch-all-pee
l
ed-fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hama
n
o
Merge br
a
nch 'ms/send-pack-honor-
c
onfig'
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C Hamano
Merge branch 'jh/par
t
ial-clone'
commit
|
commitdiff
|
tree
2018-06-28
J
un
i
o C H
a
man
o
Merge
bra
n
ch 'sg/gpg
-
tests-fix'
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C Ham
a
no
Me
r
ge branch 'a
s
/safecrlf-quiet
-
fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C H
a
mano
Merg
e
bran
c
h 'ab/re
f
spe
c
-
i
nit-f
i
x'
commit
|
commitdiff
|
tree
2018-06-25
J
u
n
i
o
C
Hamano
First batch for
2
.
19 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-25
J
unio
C
H
aman
o
Merge branch 'sb/plug-mis
c
-leaks'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge branch
'
cc/
t
ests-with
o
ut-as
s
uming
-
r
ef-f
i
l
es-backend'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C
Ham
a
no
Merge b
r
anch 'sg/updat
e
-ref-s
t
din-cle
a
nup'
commit
|
commitdiff
|
tree
2018-06-25
J
unio C Hamano
Merge bra
n
c
h 'n
d
/reject-e
m
pty-s
h
allow-
r
e
quest'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C Hamano
Merge branch 'ls/complete-r
e
m
o
te-
u
pdate-names'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
amano
Merge
branch 'ag/rebase-p'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merg
e
branch 'nd/compl
e
te-config-var
s
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Ham
a
no
M
erge branc
h
'sb/ob
j
ect-store-alloc'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o C Hamano
Mer
g
e branch 'jk/
s
how-
i
nde
x
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge
b
ran
c
h 'en/m
e
rge-recursi
v
e-tests'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge br
a
nch 'nd/di
f
f-apply-ita'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
amano
Merge branch 'ds/
c
ommit-graph-lockfile-fi
x
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
a
mano
Merge
b
r
a
n
ch 'nd/c
o
m
m
it-uti
l
-to-
s
lab'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge branch 'pc/submodule
-
h
e
l
per-foreach
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Prepare to start
2
.
19 c
y
cle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-25
Stef
a
n
Beller
sequencer
.
c: plug mem
leak i
n
g
i
t_sequenc
e
r
_co
n
fig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-21
Junio C Hamano
Git 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
J
unio C H
a
mano
Merge b
r
anch
'en/re
n
ame-
d
ir
e
c
t
ory-detection-reboot'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Hamano
Merge ta
g
'l10n-
2
.
18
.
0-
r
nd3
.
1' of
gi
t
://gith
u
b
.
com
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
J
u
nio C Hamano
Merge branch 'cf/submo
d
u
l
e-progress-dissocia
t
e'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Ham
a
no
Merge branch '
j
s/reb
a
se-i-root-fix'
commit
|
commitdiff
|
tree
2018-06-19
S
t
efan Beller
t740
0
: encapsul
a
te
s
etup code
in test_expect_
s
ucc
e
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
Todd Zullinger
t3404: check roo
t
comm
i
t in 'rebase
-i -
-
roo
t
reword
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
Karthikeyan
Singarave
l
an
doc: fix typos
in documentation and
re
l
ea
s
e notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zullinger
git-c
r
e
d
e
ntial-netrc
:
make "all
"
default target
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Almost 2
.
1
8
final
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Me
r
g
e
branch
'
e
s
/
make-
n
o-iconv'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
e
rge
branch 'sg
/
t
7
406-chain-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
H
amano
Merg
e
branch 'ks/branch-set-
u
pstr
e
a
m'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merg
e
branch 'j
s
/re
b
ase-i-root-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge br
a
nch '
j
k/ewa
h
-bou
n
d
s
-ch
e
ck'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge tag 'l10n-2
.
18
.
0-rnd3' o
f
git://gith
u
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
m
ano
A
bunc
h
of mi
c
ro-fixes before going 2
.
18 final
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C Haman
o
Merge bra
n
ch 'sb/b
l
ame-color'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hamano
M
e
rge branch '
m
w/doc-merge-e
n
umfix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hama
n
o
M
erge branch 'en/rename-d
i
rectory-detection'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
H
amano
Merge branch 'rd/doc-remo
t
e-
t
racking-with-hyp
h
e
n'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Haman
o
Merg
e
b
ranch 'jl/zlib-restore
-
nul-te
r
mination'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ha
m
a
no
Merg
e
b
ranch 'ab
/
cre
d
-n
e
trc-no-autodie'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C Hamano
Merge branch 'km
/
doc
-
w
o
rkflows-typofi
x
'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C Hama
n
o
Me
r
ge
branch 'ld/git-p4-upda
t
es
'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o
C Ha
m
ano
Merge b
r
anch 'rd/dif
f
-
o
pt
i
ons-typof
i
x
'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C H
a
mano
Merge branch 'rd
/
com
m
en
t
-t
y
pofix
-
in-
s
ha1-file'
commit
|
commitdiff
|
tree
2018-06-18
René Scharf
e
m
e
rge-recursiv
e
:
u
se xstrdup() i
n
s
te
a
d
of fixed b
u
ff
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
S
ZEDER Gábor
RelNotes 2
.
18
:
minor fix to ent
r
y about
d
ynamically
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER Gábor
t
740
6
-subm
o
dule-
u
pda
t
e:
f
ix broken
&
&
-chains
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Johanne
s
Schindel
i
n
rebas
e
--root: fix amendin
g
root commit messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Todd
Z
ullinge
r
rebase --
r
oot: dem
o
nstrate a bug while amending ro
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jeff Ki
n
g
ewah: adjust callers of
ewah_
r
ead
_
mmap()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jeff King
ewah_read_mmap: bounds-check mm
a
p reads
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Kaar
t
i
c
Sivara
a
m
t3200: clarif
y
d
escription of -
-
se
t
-upstream tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
L
uis Ma
r
sano
git-credentia
l
-netrc: fix exit
s
tatus
w
hen tests f
a
i
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Luis Mars
a
no
g
it-cre
d
ential-netrc
:
use in-tree Git
.
pm for
test
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Tod
d
Zullinger
git-creden
t
ial-
n
etrc: minor whitespace cleanup i
n
t
e
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-15
E
ri
c
Sunshi
n
e
M
a
kefile:
m
a
ke NO_ICONV really mean "no
iconv"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-15
Juni
o
C Hamano
tests:
c
l
e
an after
S
ANITY tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
St
e
fan Beller
t5
5
2
6
: test recursive submodules when
f
etching
m
oved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Stefan
B
eller
submodule: fix
N
ULL c
o
rrectness in r
e
named
b
roken submodule
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Meng-Sung Wu
doc
:
u
p
da
t
e
the orde
r
of
t
he syntax `gi
t
merge --continue`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
R
ené Schar
f
e
blame
:
relea
s
e string_list aft
e
r use in parse_color_fields()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Re
n
é Scha
r
f
e
merge-recu
r
sive: use
xs
t
rdup() instead of
f
i
xe
d
buff
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
J
u
ni
o
C
H
aman
o
Git 2
.
1
8
-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Junio C Haman
o
Merge
branch 'jk/
i
ndex-pack-maint'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
M
erg
e
b
ranch 's
g
/comple
t
ion-zsh-w
o
rkaroun
d
'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
M
erge branch 's
b
/submodule-m
e
rge-in
-
m
erge-recursive
'
commit
|
commitdiff
|
tree
2018-06-13
J
u
n
io C Hamano
Merge bra
n
ch
'jk
/
submodule-fs
c
k-
l
oos
e
-fixup'
commit
|
commitdiff
|
tree
2018-06-13
Kirill Smelkov
fetch
-
p
ack
:
test
explici
t
ly
t
hat --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
Je
r
emy
Linton
packfile: c
o
r
rec
t
zlib buffer handl
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
E
lijah Newren
R
e
lNotes 2
.
18: clarif
y
where director
y
rename de
t
e
ction
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Robe
r
t P
.
J
.
D
a
y
Use hy
p
henated "remote-t
r
acking branch"
(doc
s
and comme
n
ts)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Æ
v
ar Arnfjörð Bja
r
m
ason
git-credential-netrc: remove use of "autodie"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
git-p4: a
u
to
-
s
i
z
e the blo
c
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke
D
iamand
git-p4: narrow the scope of
e
xceptions caught when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
L
uk
e
Diam
a
nd
git-p4: raise exce
p
ti
o
ns f
r
om
p
4CmdList bas
e
d
on error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
L
uke Diam
a
nd
gi
t
-p4: better
erro
r
r
e
porting
when p4 fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
L
u
k
e Diam
a
n
d
git-p4:
a
d
d option to disable synci
n
g of p4/m
a
ster
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diam
a
nd
git-p4: disable-rebase:
allow setting this via
c
on
f
igura
t
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next