repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: when comparing files, don't include trees
2018-05-08
Elijah
N
ew
r
en
merg
e
-recursive: when comparing files
,
do
n
't include
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: check for file lev
e
l con
f
lict
s
then
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-recursive: a
d
d computa
t
ion of collisions due
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
New
r
en
merge-recursive: ch
e
ck
for
d
irectory le
v
e
l
conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-08
El
i
j
a
h N
e
wren
merge-recursive: add ge
t
_dir
e
c
tory_renames()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
E
li
j
ah Newren
merge
-
recursive: make a
h
elper function for cl
e
anup
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
merge-recurs
i
ve: s
p
li
t
ou
t
code
f
o
r determining d
i
ff_filepairs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-r
e
cu
r
sive: make !
o
->det
e
ct_rename
c
odepath more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
Newren
merge-rec
u
r
s
ive: fix leaks of allocated renames and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
m
e
rge-rec
u
rs
i
ve: i
n
troduce new func
t
i
o
n
s to h
a
n
dle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah N
e
wren
merge-recursive: move the get_renames() function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
direc
t
ory rename
detection: t
e
sts f
o
r handling
o
v
e
rwriting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
N
e
wren
directory rename
d
e
t
ectio
n
:
t
ests
for hand
l
ing overw
r
i
t
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
irectory rename detection:
m
iscell
a
neous testcases
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
di
r
ec
t
ory
r
e
n
ame detection: testcases expl
o
ring p
o
ss
i
b
ly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename det
e
c
t
ion: more involved edge/corner
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
dir
e
ctory re
n
ame d
e
tection:
t
estc
a
ses c
h
ecking which
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
directory rename detectio
n
: file
s
/directories in t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h
N
e
wre
n
directory
rename det
e
ction: partially renamed d
i
re
c
tory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
dire
c
tory renam
e
d
e
tec
t
ion: testcases to avoid taking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
directory ren
a
me detection: directory
splitting test
c
ases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory r
e
name detec
t
ion:
basic testcases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
J
u
n
io
C
Hamano
Merge b
r
anch 'svn/authors-prog-
2
' of git://bog
o
mi
p
s
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
J
u
nio C H
a
m
ano
R
e
ver
t
"Merge branch
'
en/rename-director
y
-
d
etec
t
io
n
'"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io C Hamano
The third batch for
2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-11
Junio
C Hamano
Merge b
r
a
nch 'eb/cred-hel
p
er-
i
gnore-
s
igpipe'
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o C Ham
a
no
Merge branch 'lv/tls-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Me
r
g
e bra
n
ch 'pk/test-avoid-pipe-hi
d
ing-exi
t
-
status'
commit
|
commitdiff
|
tree
2018-04-11
Junio C H
a
ma
n
o
Merg
e
branch 'rs/status-w
i
th-rem
o
ved-s
u
bmod
u
l
e
'
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io C
H
a
mano
Merge branch '
n
d/
c
o
m
bined-test-
h
elpe
r
'
commit
|
commitdiff
|
tree
2018-04-11
J
u
n
i
o C Hamano
M
erge bra
n
ch 'sb/packfiles-in-repo
s
itory'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Ham
a
no
Me
r
g
e
b
ranch 'sb/object-store'
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io C Hama
n
o
M
er
g
e b
r
anc
h
'jc
/
test-mu
s
t-be-empty'
commit
|
commitdiff
|
tree
2018-04-11
Junio C
H
amano
Merge branch 'cc/
p
erf-ag
g
regate-so
r
t'
commit
|
commitdiff
|
tree
2018-04-11
Ju
n
io C
Ha
m
ano
M
erge b
r
anch
'
ab/d
o
c-hash-broke
n
ne
s
s'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hama
n
o
Merge branch 'bc/hash-indepe
n
dent-tes
t
s'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge br
a
nch
'
ab/drop-contrib-e
x
amp
l
es'
commit
|
commitdiff
|
tree
2018-04-10
Junio C H
a
man
o
The second batch for
2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-10
Ju
n
io C Hamano
Merge branch 'ys/
b
isect-o
b
je
c
t
-
i
d-mis
s
ing
-
conversion
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o C Hamano
M
erge b
r
anch 'yk/filter-branch-non-commit
t
ish-
r
efs'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
H
amano
Me
r
ge branch 'nd/t
r
ace
-
with-env'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
Me
r
ge br
a
n
c
h 'n
d
/pa
r
seopt-c
o
m
plet
i
o
n
-more'
commit
|
commitdiff
|
tree
2018-04-10
Junio
C H
a
m
a
no
Merge
b
ranch
'ds/bsearch-ha
s
h'
commit
|
commitdiff
|
tree
2018-04-10
Junio C Hamano
M
erge branch 'ws/reb
a
s
e-p'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o
C Hamano
Me
r
ge branch 'jk
/
dif
f
-h
i
g
hlight
-
g
raph-
f
i
x'
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C Hamano
Merge br
a
nch 'nd/
r
emove-ignore-env-
f
ield'
commit
|
commitdiff
|
tree
2018-04-10
Juni
o
C
H
amano
Merge
br
a
nch 'ps/conta
i
ns-id-e
r
ror-mess
a
g
e
'
commit
|
commitdiff
|
tree
2018-04-09
J
u
nio C Hamano
The first bat
c
h
for
2
.
1
8
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-09
Junio
C
Hamano
Merge branch 'tg/stash-untracked-with-pat
h
spec-fi
x
'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C
Ha
m
a
n
o
Merg
e
branc
h
'
nd/
w
orktree-
p
run
e
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Haman
o
Merge branch 'bc
/
object-id'
commit
|
commitdiff
|
tree
2018-04-09
Juni
o
C
Hamano
Merge bran
c
h 'm
a
/
s
hortlog-re
v
pa
r
se'
commit
|
commitdiff
|
tree
2018-04-09
J
unio C
H
amano
M
er
g
e
branch 'ab/install-symlinks'
commit
|
commitdiff
|
tree
2018-04-09
J
u
nio C Hamano
Merge b
r
an
c
h 'ml/filter-branch
-
no
-
op-error'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Mer
g
e
branch
'
ab/
p
cre
-
v
2
'
commit
|
commitdiff
|
tree
2018-04-09
J
u
nio C H
a
m
a
no
Me
r
ge branc
h
'ti/fetch-everythin
g
-l
o
cal-optim'
commit
|
commitdiff
|
tree
2018-04-09
Juni
o
C Hama
n
o
Merge branc
h
'en/rename-
d
irectory-detection'
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hamano
G
i
t 2
.
17
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-02
J
unio C Hamano
Merge tag 'l
1
0n-2
.
1
7
.
0-r
n
d1' o
f
git:
/
/github
.
com/gi
t
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hama
n
o
Merg
e
branch 'pw/a
d
d
-p-si
n
gle'
commit
|
commitdiff
|
tree
2018-04-01
Ævar Arnfjörð Bjarmaso
n
add -p: fix 2
.
17
.
0-rc* regres
s
ion
d
ue to moved code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Ju
n
io
C
Hamano
Merge
b
r
anch 'j
h
/partial-clone'
commit
|
commitdiff
|
tree
2018-03-29
J
onathan Nieder
upload-
p
ack: disa
b
l
e
object fi
l
tering when disabled
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Erik
E Brady
credential: ign
o
re
S
I
GPIPE when
writing to crede
n
tial
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Log
a
naden Ve
l
v
indro
n
http:
a
llow use
of TLS 1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
René Schar
f
e
su
b
module:
check for NULL return o
f
get_s
u
b
m
odule_r
e
f
_
store
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hamano
Git 2
.
17-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Junio C Haman
o
Merge branch
't
g
/stash-doc
-
typofix'
commit
|
commitdiff
|
tree
2018-03-28
Junio C H
a
ma
n
o
Me
r
g
e
branch 'p
c
/sub
m
odule-helper
'
commit
|
commitdiff
|
tree
2018-03-28
Junio
C H
a
man
o
Merg
e
branc
h
'nd/p
a
r
s
eopt-completi
o
n'
commit
|
commitdiff
|
tree
2018-03-28
Pratik
K
a
rki
te
s
t: avoid p
i
pes
in
g
it
related
c
ommands for test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
S
t
e
f
an Beller
sub
m
odu
l
e
deinit: handle n
o
n existing paths
p
e
cs
g
r
a
cef
u
lly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Thomas Gummerer
git-s
t
a
s
h
.
t
x
t
: remo
v
e ex
t
ra square b
r
acket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arnfjörð
Bjarmason
d
oc hash-funct
i
o
n-trans
i
tion
:
clarify what SHAttered
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Ævar Arn
f
jörð Bjarmason
doc has
h
-function-tra
n
sition: c
l
arify how ol
d
er
g
i
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
SZEDER Gábor
test_must_be_empty: simplify f
i
le
exi
s
tence check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
C
h
ristian Couder
perf/ag
g
r
e
g
ate: ad
d
--s
o
rt-by=regres
s
ion option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Christian Coud
e
r
perf/agg
r
egate: add displa
y
_dir()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái Ngọc Du
y
t/helper: me
r
g
e test-w
r
ite-cache int
o
test-tool
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/h
e
lper: merge test-wildmatch
i
n
t
o test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
g
u
y
ễ
n
Thái
N
gọc
Duy
t
/helper: m
e
rge test-
u
rlmatch-n
o
rma
l
i
zation in
t
o test
.
.
.
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
er: mer
g
e
t
est-
s
ubprocess
into test-too
l
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: me
r
g
e
test-s
u
bmodule-config 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/
h
el
p
e
r
: mer
g
e
t
es
t
-stri
n
g-list i
n
to 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-strcmp-offset into te
s
t-t
o
o
l
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-sigc
h
ain 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-arra
y
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: merg
e
test-scrap-cache-tree
int
o
te
s
t-t
o
o
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn
T
hái Ngọc D
u
y
t/helper: merge t
e
st-run-
c
ommand
i
nto 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:
m
e
r
ge test-revision-walking
i
nto test-too
l
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
:
merg
e
tes
t
-
r
egex 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:
m
e
rge
test-ref-sto
r
e
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:
m
e
rg
e
t
e
st-read-cache i
n
t
o te
s
t-t
o
ol
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 te
s
t-prio-queue in
t
o 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
-
path-utils 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
er: m
e
rg
e
test-onlin
e
-
cpus into test-
t
o
o
l
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-mktemp into test
-
tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
g
uyễ
n
Th
á
i Ng
ọ
c Du
y
t
/helper: merge (unused)
t
est-
m
er
g
e
sort into t
e
s
t
-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: mer
g
e (unused) test-matc
h
-tree
s
into
t
e
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-27
N
g
u
yễn Thái Ngọc D
u
y
t
/
h
elpe
r
: m
e
r
g
e te
s
t-
i
n
dex-vers
i
on into test-tool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next