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: check for file level conflicts then get new name
2018-05-08
Elijah N
e
wren
merge-r
e
cursive:
check for file level con
f
licts
then
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
me
r
ge-r
e
curs
i
ve
:
a
d
d computation of collisions due
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-re
c
ursive:
c
heck for directory
l
ev
e
l conf
l
ic
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah N
e
wren
m
e
r
ge-recursive:
a
dd get_dire
c
tory_renames()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
merge-recurs
i
ve: make a help
e
r f
u
nction for cle
a
nup
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive:
s
plit o
u
t
c
o
de for
d
e
t
er
m
i
n
ing diff_filepairs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
m
e
rge-rec
u
rsi
v
e: make
!
o->
d
ete
c
t_rename codep
a
th
more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
me
r
ge-recursive
:
fi
x
l
eak
s
of allocated ren
a
mes and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge
-
re
c
ursive:
i
ntrod
u
ce new functi
o
ns to handle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
w
r
en
m
erge-recursive: move t
h
e get_rena
m
es() fun
c
tio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
di
r
e
c
tory rename
detection: tests
f
or handlin
g
overwriting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah
N
ewren
d
ire
c
tory renam
e
d
etection: tests for handling overwriting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Ne
w
ren
d
irecto
r
y r
e
name detection:
miscellaneou
s
testcases
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection: testcases explori
n
g possibly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
New
r
en
di
r
ectory
r
e
name detection: m
o
re involved
e
dge/corner
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory renam
e
d
etection: testc
a
ses
checking which
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
dire
c
tory renam
e
detect
i
on: files/dir
e
ctor
i
es in t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
directory rename detection: p
a
rtially
renamed di
r
ec
t
ory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newre
n
directory
r
ename
d
etection:
t
estcases to avoid taking
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rena
m
e dete
c
t
i
on:
directory splitting testcase
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
r
e
ctory rename d
e
tec
t
ion
:
basic
t
estcases
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
Junio
C Hamano
Mer
g
e
branch '
s
vn/authors-pr
o
g-2' of gi
t
:/
/
b
ogomips
.
.
.
commit
|
commitdiff
|
tree
2018-04-11
J
unio C H
a
mano
R
evert "M
e
rge br
a
nch 'en/rename-directory-detection
'
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
J
unio C Hamano
T
h
e
third ba
t
ch for 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-11
J
unio C Hamano
Mer
g
e bra
n
c
h
'eb/cred-helper-ignore-
s
igpi
p
e'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge
branch 'lv/tls-1
.
3'
commit
|
commitdiff
|
tree
2018-04-11
Junio C H
a
ma
n
o
Merg
e
branch
'
pk/test-
a
void-pipe-h
i
ding-exit-status'
commit
|
commitdiff
|
tree
2018-04-11
Juni
o
C
Hamano
Merge branc
h
'rs/status-with-removed-submodu
l
e'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merg
e
branch 'nd/combin
e
d-test-he
l
per
'
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o
C
Hamano
Mer
g
e branch '
s
b/pac
k
files
-
i
n
-repository'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Merge bran
c
h
'sb/object-
s
tore'
commit
|
commitdiff
|
tree
2018-04-11
Junio C Hamano
Me
r
ge branch '
j
c/test-mu
s
t-be-empty'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C Hamano
M
e
rge branch 'cc/perf-aggr
e
gate-sort'
commit
|
commitdiff
|
tree
2018-04-11
J
unio C Hamano
Merge branch 'ab/doc-hash-brokenness'
commit
|
commitdiff
|
tree
2018-04-11
Jun
i
o C
H
amano
M
er
g
e
b
ran
c
h
'
bc/
h
a
sh-independe
n
t-tests'
commit
|
commitdiff
|
tree
2018-04-11
Junio
C
Hamano
Merge bra
n
c
h 'ab/drop-contrib-examples'
commit
|
commitdiff
|
tree
2018-04-10
Junio
C
Hamano
Th
e
se
c
on
d
batch f
o
r
2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-10
Junio
C Hamano
Merg
e
b
ranch 'ys/bisect-object-id-miss
i
ng
-
co
n
ver
s
ion
.
.
.
commit
|
commitdiff
|
tree
2018-04-10
Junio C H
a
mano
Merge branch 'yk/
f
ilter-branch-non-committ
i
sh-refs'
commit
|
commitdiff
|
tree
2018-04-10
Junio C
Hamano
Merge branch 'nd
/
trace-with-e
n
v'
commit
|
commitdiff
|
tree
2018-04-10
J
unio C Hamano
Me
r
g
e branch 'n
d
/parseopt-completion
-
m
o
re'
commit
|
commitdiff
|
tree
2018-04-10
Jun
i
o C Ham
a
n
o
Merge branch 'ds/bsea
r
c
h-hash'
commit
|
commitdiff
|
tree
2018-04-10
Ju
n
io C Hamano
Merge branch 'ws/re
b
a
s
e-
p
'
commit
|
commitdiff
|
tree
2018-04-10
Junio
C
H
amano
Mer
g
e
bra
n
ch 'jk/diff-
h
ighlig
h
t-
g
r
a
ph-fi
x
'
commit
|
commitdiff
|
tree
2018-04-10
Junio
C
Hamano
Merg
e
b
r
anch '
n
d/remov
e
-ignore-env-field'
commit
|
commitdiff
|
tree
2018-04-10
J
u
n
i
o
C Hamano
Merge branc
h
'ps/contain
s
-id-err
o
r-mess
a
ge'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
The f
i
rst batch for 2
.
18 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-09
Junio C H
a
mano
Merge
b
ranch 'tg/s
t
a
s
h-untra
c
k
e
d-with-path
s
pe
c
-
f
ix'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
M
e
rge
b
r
a
nch 'nd/worktree-prune'
commit
|
commitdiff
|
tree
2018-04-09
Junio
C
Hamano
Merge branch
'bc/object-id'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hama
n
o
M
erg
e
branch 'ma/shortl
o
g-revparse
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Hamano
Mer
g
e bra
n
ch 'ab/ins
t
a
ll-sym
l
inks'
commit
|
commitdiff
|
tree
2018-04-09
Ju
n
io
C Ham
a
n
o
Mer
g
e
branch
'
ml/filter-branch
-
no-o
p
-
e
rror
'
commit
|
commitdiff
|
tree
2018-04-09
Junio C
Hama
n
o
Merge
branch
'ab/pcr
e
-
v2'
commit
|
commitdiff
|
tree
2018-04-09
Jun
i
o C Hamano
Merge b
r
anch
'ti/
f
etch-everyt
h
ing-local-
o
ptim'
commit
|
commitdiff
|
tree
2018-04-09
Junio C Ha
m
ano
Merge b
r
anc
h
'en/rename-
d
i
rectory-dete
c
t
i
on'
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hamano
Gi
t
2
.
1
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-04-02
Junio C Ha
m
ano
Mer
g
e tag 'l10n-
2
.
17
.
0-rnd1' of git://
g
i
t
hub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Junio C Hamano
Merge b
r
anch 'pw/
a
dd-p-sing
l
e'
commit
|
commitdiff
|
tree
2018-04-01
Æ
va
r
Arnf
j
örð
B
j
a
rmas
o
n
add -p: fix
2
.
1
7
.
0-
r
c* regres
s
i
on due to moved code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Jun
i
o C H
a
m
a
no
Merge branch 'j
h
/partia
l
-clone'
commit
|
commitdiff
|
tree
2018-03-29
J
ona
t
han
N
ieder
upload-pack: disab
l
e object
f
iltering
w
hen disabled
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
Erik
E
Br
a
dy
cre
d
ential: ignore SIGP
I
PE when writing to c
r
e
d
ential
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-29
L
o
ganaden Velvindron
http: allow use of T
L
S 1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Re
n
é Scha
r
fe
submod
u
le:
check for
NULL return of ge
t
_submodule_r
e
f
_store(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Ju
n
io C Hamano
Git 2
.
17-rc
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hamano
Merge branc
h
'tg/stash-doc-typ
o
fix
'
commit
|
commitdiff
|
tree
2018-03-28
Junio C
Haman
o
Mer
g
e
branch
'pc/submodule-helper'
commit
|
commitdiff
|
tree
2018-03-28
Junio
C Hamano
M
erg
e
branch 'nd/pa
r
seopt-c
o
mpletion
'
commit
|
commitdiff
|
tree
2018-03-28
P
r
at
i
k
Karki
tes
t
: avoid pipes
in gi
t
related commands fo
r
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
S
tefan Beller
submodule dei
n
it: handle non existing pa
t
hspecs
g
racefully
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Thom
a
s Gumm
e
rer
git-
s
tash
.
txt: remove extra s
q
u
a
re
b
racket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Æva
r
A
r
nfjörð Bjarmason
doc hash-fun
c
tion-transition: clarify what S
H
Attered
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Æ
var Arn
f
jörð Bjarmason
d
oc
hash-fu
n
c
t
ion-
t
r
ansit
i
on: clarify how olde
r
gits
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
SZE
D
ER Gáb
o
r
tes
t
_m
u
st_be_e
m
p
ty: simpli
f
y
file existence check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Christian
C
o
uder
perf/aggre
g
a
te: add --s
o
rt-by=regression
op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-28
Christian C
o
uder
perf/aggregate:
a
dd d
i
splay_dir
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguyễn Thái
N
gọc Duy
t/he
l
per: merge test-write-cache int
o
test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ngu
y
ễ
n
Th
á
i
Ngọc Duy
t/hel
p
er: merge test-wildmatch into t
e
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/he
l
per: merge test-u
r
lmatch-normali
z
ation into
t
e
s
t
.
.
.
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 test-subprocess into tes
t
-to
o
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
/
he
l
per: me
r
ge test-submodule
-
c
o
nfig 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-string-li
s
t 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 te
s
t-s
t
rcmp-off
s
et into
t
est-t
o
ol
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-sig
c
h
a
in into test-t
o
ol
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ngu
y
ễn Thái Ngọc Du
y
t
/
helper: m
e
rge 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/helper: merge test
-
scra
p
-
c
ache-tree in
t
o 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/helper:
m
erge test-run-c
o
mma
n
d
i
nto test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Ngu
y
ễ
n
T
hái
Ngọc
Duy
t
/
h
e
l
per: merge test-revision-walki
n
g
into
t
e
st-tool
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/he
l
per: m
e
rge test-
r
egex
i
n
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 Duy
t/help
e
r:
m
erge test-ref-store 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
e
l
per:
m
erge t
e
s
t-read-cach
e
into tes
t
-to
o
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
guyễn
T
h
á
i
N
gọc Duy
t
/
he
l
per: mer
g
e
te
s
t-prio-queue into test-too
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
Nguy
ễ
n
Thái Ngọ
c
Duy
t/h
e
lper: merg
e
t
est-path-
u
til
s
into test-tool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-03-27
N
gu
y
ễn Thái Ngọc Duy
t/hel
p
er:
m
e
r
ge test-onlin
e
-
cpus
i
n
to test-to
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/help
e
r: mer
g
e test-mktem
p
into test-
t
ool
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
(unused) test-m
e
rgesor
t
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/hel
p
er: merge (unuse
d
) te
s
t-m
a
t
c
h-trees
into test
.
.
.
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/helper:
m
erge te
s
t-
i
ndex-version
i
nto test-t
o
ol
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: me
r
ge test-h
a
sh
m
ap into test-t
o
o
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next