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
t6042: add testcase covering rename/add/delete conflict type
2018-07-03
E
l
i
jah Newr
e
n
t6042: add te
s
t
case covering rename/add/de
l
et
e
conf
l
i
ct
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-13
Elija
h
Newren
RelNote
s
2
.
18: clarify where directory rename de
t
ection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-01
E
lijah Newren
RelNotes: remove dupli
c
a
te release note
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036: p
r
efer test_
w
hen_finishe
d
t
o manual c
l
eanup
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036,
t6042: prefer t
e
st_cmp to sequences
o
f test
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ija
h
Newr
e
n
t603
6
, t6042: pr
e
fer
tes
t
_path_is_
f
ile, test_path_is_
m
issing
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-28
E
li
j
ah Newren
t
6
036, t6042: use test_l
i
ne_co
u
n
t
inste
a
d o
f
w
c
-l
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Ne
w
ren
t6036, t6042
:
use te
s
t_cr
e
ate_repo to keep tests ind
e
pendent
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-25
Elijah
N
ew
r
en
rev-parse: check looku
p
'ed
c
ommit
r
e
f
er
e
n
c
es f
o
r NULL
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-20
Elij
a
h Newr
e
n
merge-recursive:
provide pair of `un
p
ack_trees_{start
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merg
e
-
r
ecursive
:
fix c
h
eck fo
r
skipability of wor
k
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursi
v
e: make
"Aut
o
-merging
"
comment show for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recursive: fix remainder of was
_
dir
t
y() to use
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
N
e
wren
merge-
r
ecursive: fix was_tracked() to quit
l
yin
g
with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
t6046: testcases
checking whether updates can be sk
i
pped
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
m
erge-recursive
:
av
o
id trig
g
erin
g
a
d
d_cacheinfo error
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah N
e
wren
mer
g
e-recu
r
sive: move more is_dirty handl
i
ng
t
o mer
g
e_co
n
tent
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah New
r
en
merge-recursive:
improve add_cachei
n
fo
e
r
ror handling
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-
recursi
v
e
:
avoid spurious r
e
name/rename conflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
directory rena
m
e detection: new testcases
s
howcasin
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
me
r
ge-recursive: fix rem
a
ining dir
e
cto
r
y rename + dirty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursi
v
e: fi
x
overwriting d
i
rty
files inv
o
lved
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursive: avo
i
d clobb
e
ring
untra
c
ked fil
e
s with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newren
merge-recursive: a
p
ply necessar
y
m
o
dificatio
n
s for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive: when comp
a
ring files
,
don't in
c
l
u
d
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
e
wren
merge-recu
r
sive:
c
he
c
k for fi
l
e level conflicts then
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
m
e
rge-recursive:
a
dd
c
omput
a
tio
n
of collisions du
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ija
h
N
ewren
merge-recursiv
e
: check
f
o
r
direct
o
r
y
l
evel conflict
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursiv
e
: ad
d
get_
d
irecto
r
y
_renames()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-02
Elijah Newren
un
p
ack_trees: fix breakage w
h
en o->src_ind
e
x
!= o-
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-25
E
l
i
jah Newren
Make running gi
t
u
n
der other
debug
g
er-like programs
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recur
s
i
ve
:
make a hel
p
er f
u
nction for cleanup
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recu
r
sive: s
p
lit
o
ut code
for det
e
rmining dif
f
_f
i
l
e
p
a
i
r
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-r
e
cursi
v
e:
make !o->de
t
ect_
r
ename cod
e
path more
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
w
r
e
n
merge-recursi
v
e: fi
x
leaks of all
o
cated renam
e
s and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
m
e
rg
e
-recursive:
introdu
c
e new functi
o
ns to h
a
ndle
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merg
e
-recurs
i
ve:
m
ove th
e
ge
t
_renames() function
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
director
y
r
ename
detect
i
on
:
te
s
ts for
ha
n
dling overwrit
i
ng
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
rectory re
n
a
me det
e
ction:
tests for handl
i
ng overw
r
iting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
di
r
ectory renam
e
detecti
o
n: miscel
l
aneous
t
e
st
c
ases
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newren
directory rename de
t
e
ct
i
on: testcases explo
r
i
n
g possi
b
ly
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Newren
directory
rename detection:
m
ore
involved edge/corne
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
directory r
e
n
a
m
e
detecti
o
n: testc
a
ses checking which
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
d
irectory rename detection
:
fil
e
s/
d
irectories i
n
the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
a
h New
r
e
n
directory
r
e
n
ame
d
et
e
ction: partially
renamed directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
li
j
a
h
New
r
en
d
i
r
ectory re
n
ame det
e
c
tion: testc
a
s
es to a
v
oid taking
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
d
irectory renam
e
det
e
ctio
n
: director
y
splitting testcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
j
ah Newren
director
y
renam
e
det
e
ct
i
on:
b
as
i
c
t
estcase
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newr
e
n
Doc
u
mentation: norma
l
i
ze spelli
n
g
o
f
'normalise
d
'
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documentation: fix s
e
ve
r
al one-character-
o
f
f spelling
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recursive:
ensure we write updates for di
r
ect
o
ry
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah Newren
merg
e
-recursive: avoid
s
puriou
s
ren
a
m
e
/rename
c
onflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
directory rename detect
i
on: new test
c
ases showcasing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newr
e
n
merge-recursive: fix
remaining direct
o
ry re
n
ame + d
i
rty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah Newre
n
merge
-
recur
s
ive:
f
ix o
v
erwriting
d
irty file
s
involve
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
ew
r
e
n
merge-
r
ecu
r
sive
:
avoid clobber
i
n
g
untr
a
c
k
ed
f
iles with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wren
merge-
r
ecursive: app
l
y nec
e
ssary modi
f
icat
i
ons f
o
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-r
e
c
u
rs
i
ve: w
h
en comparing files, don't
i
nclude
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
w
re
n
merge-recu
r
sive:
c
heck for f
i
le le
v
el c
o
n
f
licts then
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newr
e
n
merge-recursive: add co
m
putation of collisions due
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
merge-
r
ecur
s
ive: check f
o
r directory level conf
l
icts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: add
get_directory
_
re
n
ames()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah New
r
en
mer
g
e-recurs
i
ve: make a helper function
f
or cle
a
n
u
p
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-r
e
c
u
rsive: sp
l
it out cod
e
f
o
r
determining diff_
f
ilepairs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ija
h
New
r
en
merge-recursive:
m
ake
!
o->
d
e
tect_rena
m
e codep
a
th more
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e-recursive: fix leaks
o
f
a
l
l
oca
t
ed rena
m
es and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
merge-recurs
i
v
e: intro
d
uce new
fu
n
ctions to
h
andle
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
e
n
merge-recursive: move the
g
et_rena
m
es() function
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
New
r
en
direct
o
ry rename d
e
t
e
cti
o
n: te
s
ts for handling overwriting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
lij
a
h Newren
dir
e
ctory rename det
e
ction:
t
ests for ha
n
d
l
ing
o
v
erwriting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
ah Newren
di
r
e
c
tory rename detect
i
o
n
:
m
i
scel
l
aneous testcases
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newre
n
directory ren
a
me
d
ete
c
tion: testcases explor
i
ng poss
i
bl
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
El
i
ja
h
Newren
directory
renam
e
dete
c
tion: mor
e
involved edge/corner
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename dete
c
tion: test
c
a
ses checking wh
i
ch
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
direct
o
ry rename
d
e
tecti
o
n
: files/dire
c
tories in the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newre
n
directory rename dete
c
tion: p
a
rt
i
a
l
ly renamed dire
c
tory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ij
a
h
N
ewren
directory rename dete
c
tion: te
s
tcases to avoid
t
aking
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Ne
w
re
n
direct
o
ry
ren
a
me detect
i
on: dire
c
tory spl
i
t
t
i
ng testcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory rename d
e
tectio
n
:
b
a
sic testcas
e
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursive: add expla
n
a
tion for s
r
c_en
t
ry and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
El
i
ja
h
New
r
en
m
erge-recursive: fix logic ordering
i
ssue
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
E
lijah Ne
w
ren
Tig
h
ten and correct a
few testca
s
es for merging and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
merge-re
c
ursive: avoid incorpo
r
ating uncommitted cha
n
ges
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elij
a
h Newren
move index
_
has
_
change
s
() from builtin/am
.
c to merge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t6044
:
recu
r
sive
can s
i
lently incorpora
t
e
di
r
ty chang
e
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-05
E
l
i
j
a
h
Newren
strbuf: remove unused
stri
p
space f
u
nc
t
ion
a
lia
s
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
E
l
ijah N
e
wren
m
erge
-
recursive: ignore_cas
e
s
h
ouldn't
rejec
t
intentional
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Newren
sequ
e
nc
e
r:
s
how
r
ename progre
s
s d
u
r
ing c
h
e
rry picks
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Ne
w
r
en
diff: remove
s
ilent c
l
amp of rena
m
eLimit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
progr
e
ss: fix pro
g
r
e
ss met
e
rs when deali
n
g with
l
o
t
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
m
er
g
e-recursive: han
d
le additio
n
of submodule on ou
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
s
e
quencer: warn when
i
nternal
merge ma
y
be suboptima
l
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newren
t6044: new mer
g
e tes
t
cases for when
i
n
dex doesn't match
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah
N
e
wren
merge-o
c
topus:
abort if
in
d
ex do
e
s
not m
a
t
c
h HE
A
D
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah New
r
en
builtin/merge
.
c: fix
a bug wit
h
trivial merges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah Newren
t
7
605: add
a
testcase de
m
onstrat
i
ng a bug with tr
i
vial
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
E
l
i
jah Ne
w
ren
m
e
rge-recursive
:
do not ch
e
ck wor
k
ing co
p
y when creating
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
a
h Ne
w
ren
merge-recurs
i
ve:
r
emove duplica
t
e cod
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
D
on't
re-sort a list whose order
w
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
wr
e
n
merge-r
e
cursive: Fix
v
irt
u
al merge base for rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next