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: check for directory level conflicts
2018-05-08
Elijah Newr
e
n
merge-recursi
v
e: che
c
k for directory level c
o
nfli
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
mer
g
e-recursive: add
get_
d
ire
c
tor
y
_
r
enames()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
merge-recursive: mak
e
a hel
p
er f
u
nc
t
ion for cleanup
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive
:
split out
code for
d
e
termi
n
i
n
g diff_file
p
airs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
li
j
a
h New
r
en
merge-recursive: make
!o->d
e
tect_rena
m
e codepath mor
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewre
n
merge-recur
s
i
ve: fix leaks of allocated renames and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-re
c
ursive: introd
u
ce new functions to handle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
m
e
rge
-
r
e
c
u
r
s
i
ve: move the
get_renames() func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
d
i
rector
y
rena
m
e
dete
c
tion: tests for ha
n
dling overwriting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory ren
a
me detection: tests for handling overwrit
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
r
en
directory ren
a
m
e detec
t
ion: misce
l
laneous testc
a
ses
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
di
r
ectory rename detecti
o
n
:
testcases
e
xpl
o
ri
n
g po
s
sibly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lij
a
h Newren
directory rename detection: more involved
edge/corner
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h N
e
w
ren
d
irectory r
e
name detection:
testcases checking whic
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Newren
director
y
rename det
e
ction: files/
d
irectories in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
d
i
r
e
ctor
y
ren
a
me detect
i
on: partially rena
m
e
d
directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
directory rename det
e
ction: t
e
s
tcases to avoid takin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
directory rename detection: direc
t
ory s
p
li
t
ting t
e
stc
a
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection: basic testcases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch '
s
vn/authors-p
r
og-2'
of git://
b
ogomips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io C Hamano
Revert "Merge bran
c
h
'
en/rename-directory-
d
etectio
n
'"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
i
o
C Hama
n
o
The
t
hir
d
batch for 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
J
unio C
H
amano
Merge bra
n
ch 'eb/cred-helper-ig
n
ore-s
i
gp
i
pe'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C Ham
a
no
Merge b
r
anch
'lv/tls-1
.
3
'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
Hamano
Merge branch 'pk/tes
t
-avoid-pi
p
e-hid
i
ng-exi
t
-
status'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C Hamano
Merge branch
'
r
s/
s
t
a
t
us-wi
t
h-removed-submodule'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge branch 'nd/combined-test-helper'
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C H
a
mano
Merge b
r
anch 'sb/
p
ackf
i
les-in-r
e
po
s
i
t
ory'
commit
|
commitdiff
|
tree
2018-04-11
J
unio C H
a
mano
Merge br
a
n
ch 'sb/o
b
jec
t
-store'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ha
m
ano
M
e
rge
b
ranch '
j
c/test-must-be-empty'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge
b
ranch 'cc/pe
r
f-a
g
g
r
egate-sort'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C
H
am
a
n
o
Merge branch 'ab/doc-hash-bro
k
enn
e
ss'
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
i
o
C Hamano
Merge
bra
n
ch
'
bc/hash-indep
e
ndent-tests'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge br
a
nch
'
ab/drop-contrib-examples'
commit
|
commitdiff
|
tree
2018-04-10
Ju
n
i
o
C Hamano
T
h
e
second batch for 2
.
1
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-10
J
u
n
io C Hamano
Merge branc
h
'ys/bis
e
ct-object
-
id-missin
g
-conve
r
sion
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
J
u
n
i
o
C
Hama
n
o
Merge branc
h
'yk
/
f
i
l
t
e
r-branc
h
-non-comm
i
ttish-re
f
s'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o
C Hamano
Merg
e
branch 'nd/trace-
w
i
th-env'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
H
a
mano
M
e
rge
branch
'n
d
/parseopt
-
completion-more
'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
H
amano
M
e
rg
e
br
a
nch 'ds/bsearch-hash'
commit
|
commitdiff
|
tree
2018-04-10
Junio
C
Hamano
Me
r
ge branch
'
ws/rebase-p'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Haman
o
Merge
b
ranch 'jk/diff-
h
ighlight-graph-fix'
commit
|
commitdiff
|
tree
2018-04-10
J
unio
C
Ham
a
no
Mer
g
e
branc
h
'nd
/
remove-ignore
-
en
v
-field'
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C
Haman
o
Merge b
r
anc
h
'
p
s/conta
i
ns-id-error-me
s
sage'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
T
h
e fi
r
st
b
atch
for
2
.
18 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Me
r
ge branch 'tg/stash-untracke
d
-wi
t
h
-pathspec-fix'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
Hamano
M
e
rge
b
ra
n
ch 'n
d
/w
o
rktree-prune
'
commit
|
commitdiff
|
tree
2018-04-09
Juni
o
C H
a
mano
Merg
e
branch '
b
c/object-id'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Hamano
Merge bran
c
h 'ma/shortlog-rev
p
arse'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Merge branch '
a
b/
i
nstall-symlink
s
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C H
a
m
ano
Merge bran
c
h 'ml/filter
-
branch-no-op-err
o
r'
commit
|
commitdiff
|
tree
2018-04-09
Juni
o
C Haman
o
Merge branch
'a
b
/pcre-v2'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C Hamano
Me
r
ge b
r
anch 'ti/fetch-
e
verythi
n
g-loca
l
-optim
'
commit
|
commitdiff
|
tree
2018-04-09
Jun
i
o C
Hamano
M
erge bran
c
h 'en/
r
ename-directory-detection'
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hamano
Git 2
.
17
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-02
Junio
C Ham
a
no
Merge tag 'l10n-2
.
17
.
0-rnd1' of
git://github
.
com/gi
t
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hamano
Merge branch 'pw/add
-
p
-
s
ingl
e
'
commit
|
commitdiff
|
tree
2018-04-01
Æ
v
a
r
Arnfjö
r
ð Bjar
m
a
s
on
add -p:
fi
x
2
.
17
.
0-rc*
re
g
ression due
t
o m
o
ved code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Junio C H
a
ma
n
o
Merge branch 'jh/par
t
ial-clone
'
commit
|
commitdiff
|
tree
2018-03-29
Jona
t
han Nie
d
er
upload-pack: disa
b
le
o
bjec
t
f
i
lte
r
i
n
g when disabled
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Erik E Brady
cre
d
ential: ignore SI
G
PIPE when writ
i
ng
t
o cre
d
ential
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Logana
d
en
Velvind
r
on
h
ttp: al
l
ow use of TLS 1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
René
S
charfe
submodule: check for
N
U
LL return of get
_
submodu
l
e
_ref_store()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
J
unio C Ham
a
n
o
Git 2
.
17-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
J
un
i
o C
H
amano
M
e
rge
branch 't
g
/stash-doc
-
typofix'
commit
|
commitdiff
|
tree
2018-03-28
J
u
nio C
Hamano
Merge bran
c
h
'pc
/
submodule-helpe
r
'
commit
|
commitdiff
|
tree
2018-03-28
Junio C
H
ama
n
o
M
e
rge bran
c
h 'nd/pars
e
opt-completi
o
n'
commit
|
commitdiff
|
tree
2018-03-28
Prat
i
k Ka
r
ki
t
est: avoid pipes
in git
r
el
a
ted commands for tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Stefa
n
B
eller
s
ubmodule
d
eini
t
: handle non existing pathspecs gracefully
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Thoma
s
Gumme
r
er
git-stash
.
t
x
t: remove extra square brac
k
et
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Ar
n
fjörð
Bjarm
a
son
d
o
c
hash-f
u
nction-transition: clarify
wh
a
t SHA
t
tered
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Æ
var Arnfjörð
B
j
armason
do
c
h
a
s
h-function-transition: clarif
y
how older git
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
SZ
E
DE
R
G
áb
o
r
test_must_
b
e_empty:
simplify fil
e
exis
t
e
n
c
e
chec
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Christian Couder
perf/aggregate: ad
d
--
s
ort-by=regression o
p
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Christia
n
Couder
perf/aggregate: ad
d
di
s
play_
d
ir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/helper: merge test-write-cache
i
n
to te
s
t-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Ng
u
yễn Thái Ngọc Duy
t
/h
e
lper: merge test-wildmatch into test-
t
ool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
T
hái Ngọc Duy
t
/
helper: merge test-urlmatch-normaliza
t
ion into
t
e
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ng
ọ
c Duy
t/helper:
m
erge test-su
b
proces
s
into test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
guyễ
n
Thá
i
Ngọc
Duy
t/helper: me
r
ge test-submodule-co
n
fig into te
s
t-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Th
á
i
Ngọc D
u
y
t/helper: merge test-stri
n
g
-list into test-
t
ool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Ngu
y
ễn Th
á
i Ngọc Duy
t/helper
:
m
e
rge test-
s
tr
c
m
p
-
offse
t
int
o
test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Th
á
i
Ng
ọ
c D
u
y
t/help
e
r:
merg
e
test-si
g
cha
i
n into
test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thá
i
Ng
ọ
c
Duy
t/helper: merge test-sha1-array
into test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/hel
p
e
r: me
r
ge test
-
scrap
-
cach
e
-tree int
o
t
e
st-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Ng
u
yễn
Thái
Ngọc Duy
t/h
e
lper: merge test-run-comma
n
d
i
n
to tes
t
-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái
N
gọc Duy
t/helper
:
merge tes
t
-revision-walk
i
n
g into test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
T
hái N
g
ọc Duy
t/helper
:
m
er
g
e test-regex in
t
o tes
t
-
t
ool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
g
uyễ
n
Thái Ngọc Duy
t/help
e
r
:
merge test-ref-store into
t
es
t
-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
guyễ
n
Thái Ngọc Duy
t
/helper: merge
t
est-read-cache into
t
est-to
o
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Du
y
t/hel
p
er: merge test-prio
-
queue into test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
T
hái Ngọc Duy
t/helper:
merge t
e
st-pat
h
-ut
i
l
s into test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Ngu
y
ễn Thái Ngọc D
u
y
t/hel
p
er: merge test-online-cpus into test-too
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thá
i
N
g
ọc D
u
y
t/helper: m
e
rge test-
m
ktemp into
t
es
t
-t
o
ol
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Ng
u
yễn T
h
ái Ng
ọ
c D
u
y
t/helpe
r
:
m
erg
e
(unused) te
s
t-mergesor
t
in
t
o test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc D
u
y
t/helper:
merge (unused) test-match-tre
e
s into
t
est
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
Thái Ngọc Duy
t/helper: m
e
rge test-i
n
d
ex-version into test
-
tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
guyễ
n
Thái N
g
ọc Duy
t
/
h
e
lper
:
merge
t
est-h
a
s
hmap into test
-
tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Duy
t/helper: merge test-genrandom into test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái N
g
ọc Duy
t
/
helper: merge test-
e
xam
p
le
-
decorate into
t
est-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next