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
Second batch for 2.19 cycle
2018-06-13
Elijah Newren
R
e
lN
o
tes
2
.
18: clarify where directory rename detectio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah New
r
en
RelNo
t
e
s: remove d
u
p
l
i
cate
r
e
lease note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah
N
ewren
t6036: pre
f
er test
_
when_finished to man
u
al cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
E
l
ijah
N
ewren
t603
6
, t60
4
2: pref
e
r
t
es
t
_cmp t
o
seq
u
ences o
f
test
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Ne
w
ren
t6036, t6042: prefer tes
t
_path_
i
s_file, test_p
a
t
h
_i
s
_
m
issing
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t
6036, t6042: u
s
e test_line_count instead of wc -l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-28
Elijah Newren
t6036
,
t6042: use test_create_r
e
po to kee
p
tes
t
s independent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah Newr
e
n
re
v
-parse: check lookup'
e
d
comm
i
t referen
c
es for NUL
L
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elij
a
h Newren
me
r
ge-rec
u
rsive: provide
pair o
f
`u
n
pack_trees_{s
t
a
r
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
r
e
n
merge-recursive: fix
c
heck for skipability
o
f working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h Newren
merge-
r
ecur
s
i
ve: make "Au
t
o-mergin
g
" c
o
m
ment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
merge-recursive: fi
x
remainder of was_dirt
y
() t
o
use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: fix w
a
s_track
e
d() to qu
i
t lying wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
t60
4
6: testcases check
i
ng whethe
r
u
pdate
s
c
a
n be ski
p
ped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
merge-recursi
v
e: avoid tr
i
ggering add_cachein
f
o er
r
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recur
s
ive: mov
e
m
ore is_d
i
rty
h
a
nd
l
ing
to merge_content
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
me
r
ge-recursi
v
e: improve add_cacheinfo erro
r
handling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recursive: avo
i
d spurious ren
a
me/rename conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah New
r
en
directory rename detection
:
new
test
c
ases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-recursive: fix remaining dire
c
tory rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
merge-recurs
i
ve: fix
over
w
riting d
i
rty
f
il
e
s involved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Ne
w
r
e
n
merge
-
rec
u
rsive: avoid
c
lobbering untra
c
ke
d
fi
l
e
s
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge
-
recursive: apply nec
e
ss
a
r
y
mod
i
ficat
i
ons for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
m
e
rge-recur
s
ive:
w
he
n
compa
r
ing files, don't i
n
c
l
ud
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
merge-recursiv
e
:
check for file level c
o
nflicts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
me
r
ge
-
recursive: add c
o
m
putat
i
o
n
of co
l
l
i
s
i
ons
d
ue
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newr
e
n
m
e
r
g
e-re
c
ursiv
e
: check for d
i
r
e
c
tor
y
level con
f
licts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recurs
i
ve: add
g
et_directory_renames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
E
l
ij
a
h Newren
unpack_trees: fix b
r
e
ak
a
ge when o->src_ind
e
x
!= o-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
Elijah Newr
e
n
Mak
e
ru
n
n
in
g
git under other debugger-like pr
o
grams
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ija
h
Newren
m
e
rge-recursiv
e
: m
a
ke a h
e
lper func
t
ion
f
or
c
l
e
anup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
merge-re
c
ursive: spli
t
out code f
o
r
determinin
g
dif
f
_fil
e
pai
r
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
m
erge-recursive: make
!o->
d
etect
_
re
n
ame codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
m
erge-r
e
cursive
:
fix
leaks of allocated renames
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah
N
ewren
merge
-
recur
s
ive
:
intro
d
uce n
e
w f
u
nctio
n
s to
h
andle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah New
r
e
n
m
erg
e
-recursive: mo
v
e the get_renames() funct
i
on
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah New
r
en
dir
e
ctor
y
renam
e
detection: tests fo
r
handli
n
g overwriti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h
N
ewren
directory rename dete
c
tion: te
s
ts for h
a
ndling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newr
e
n
d
irectory rename
d
e
t
ec
t
ion: mis
c
ellane
o
us testcas
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detection: testcases exploring
p
ossibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
directory ren
a
me d
e
tection: more invo
l
ved
e
dge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
directory rename de
t
ection: testc
a
ses ch
e
c
k
ing which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah N
e
w
r
en
di
r
e
c
t
o
ry rename dete
c
tio
n
: files/
d
irectories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
directory re
n
ame
dete
c
tion: p
a
rtially
r
ena
m
ed direc
t
ory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
directory r
e
name det
e
ction: t
e
stcas
e
s to avoid takin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
a
h Ne
w
r
en
dir
e
cto
r
y ren
a
me det
e
ction: di
r
ector
y
s
p
l
itting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
dire
c
t
ory
r
ename
d
e
t
ection: basi
c
testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Doc
u
mentation: no
r
ma
l
ize spell
i
ng
of
'normalised'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
Documentati
o
n: fix several on
e
-
character-of
f
s
p
e
lli
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Eli
j
ah
N
ewren
merge-recurs
i
v
e
: ensure
w
e write
updates f
o
r directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
r
e
n
merge-re
c
u
r
sive: avoid
s
purious rena
m
e
/
renam
e
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
dire
c
t
o
ry re
n
ame dete
c
tion: new testc
a
ses showcasi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wren
merge-recurs
i
ve:
f
ix remain
i
ng directory
r
en
a
me + di
r
ty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ija
h
Newren
merge
-
r
e
cursive:
f
ix ove
r
writing d
i
rt
y
f
i
les i
n
vo
l
v
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah New
r
en
m
erge-
r
ec
u
r
sive:
a
v
oid clobb
e
r
in
g
u
ntracked files w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h
Newren
merge-recursive:
apply necessary modification
s
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recurs
i
ve: when comparin
g
files, don't include
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
merge-recursi
v
e: check fo
r
file level c
o
nflict
s
then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recur
s
iv
e
: add com
p
utation of colli
s
ions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive
:
c
h
eck fo
r
di
r
ectory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-recursive: add get_directory_re
n
ames()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newr
e
n
merge-recursi
v
e: ma
k
e
a helper function for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
ah N
e
wren
mer
g
e
-r
e
c
u
r
s
ive
:
sp
l
it out code for determinin
g
di
f
f_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
w
r
en
merge-recursive: ma
k
e !o->det
e
ct_rename codepath mo
r
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
merge-recur
s
i
ve: fix
l
eak
s
of allocated re
n
ames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recursive:
i
n
t
r
oduce new func
t
i
ons to handl
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
merge-recursive:
m
ove th
e
get_renames() function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah
Ne
w
ren
di
r
ectory ren
a
me dete
c
ti
o
n
:
tests f
o
r handling overwriti
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
i
rectory r
e
n
ame detection
:
te
s
ts f
o
r handling overwri
t
in
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
director
y
r
e
n
a
m
e dete
c
tion: miscellan
e
ous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
w
ren
d
irecto
r
y
rename de
t
ect
i
on: tes
t
c
a
s
es e
x
ploring
p
ossibl
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Ne
w
r
e
n
directory r
e
name detectio
n
: mor
e
i
nvolved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
a
h
Newren
directory rename
d
etecti
o
n: tes
t
c
ases checking whic
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory renam
e
d
e
t
e
c
tion: fil
e
s
/directori
e
s in t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
a
h Ne
w
ren
directo
r
y
rena
m
e d
e
tection: parti
a
lly ren
a
med dir
e
ctor
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h N
e
wren
directory re
n
ame
d
e
t
ecti
o
n: testcases to avo
i
d taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
directory ren
a
me detection: dire
c
to
r
y splittin
g
testc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newre
n
direc
t
o
r
y re
n
ame det
e
ction: ba
s
i
c
test
c
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elij
a
h
N
ewren
m
e
rge-rec
u
rsive
:
add ex
p
l
a
natio
n
fo
r
src_ent
r
y
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merg
e
-recursive:
fix logic ordering issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
E
lij
a
h Newre
n
Tighten a
n
d
c
o
r
r
ect a few testc
a
ses f
o
r merging
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
ijah Newren
m
erge-re
c
ursive
:
avoid inco
r
porating uncommitted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
move index_has_c
h
a
nges() from
b
uiltin/am
.
c to
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
jah
Newr
e
n
t6044: r
e
c
ursive can sile
n
tly i
n
corporate dirty ch
a
ng
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elij
a
h Newren
s
trbuf: remove unuse
d
str
i
psp
a
c
e
fu
n
ction alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah N
e
wren
merg
e
-recursive: ignore_case shouldn'
t
rej
e
ct intenti
o
nal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah Newren
s
e
quen
c
er: s
h
ow r
e
name pro
g
ress dur
i
n
g
cherry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah N
e
wren
diff:
r
emov
e
s
ilent cl
a
mp of renameLi
m
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
p
r
o
gress: fix progress meters when dealing wi
t
h
lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elija
h
Newren
merge-recursive:
h
andl
e
a
dd
i
t
ion of
submodule
o
n our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
s
eque
n
cer: w
a
rn when in
t
e
r
nal merg
e
may be subopti
m
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah Newren
t6044
:
new merg
e
tes
t
cases for
w
hen in
d
ex does
n
'
t match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
merge-octopus: abort if index
does
not match H
E
AD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
Newren
builti
n
/merge
.
c
: fix a
b
ug
with trivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
e
w
re
n
t7605: add a testcase demonstrati
n
g a bug with tr
i
vial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
i
j
ah
N
ewren
merge-recu
r
sive: do not
check working copy when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
e
wren
merge-re
c
ursive:
r
emove duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Don
'
t re-
s
o
r
t a list whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merg
e
-
r
ecursive: Fix vi
r
tu
a
l merge
base for r
e
na
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6036: criss-cross
+
rename/rename(1to2
)
/ad
d
-des
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next