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 branch 'st/verify-tag'
2016-04-13
Elijah N
e
w
ren
merge
-
oc
t
o
pus: abo
r
t i
f
index doe
s
not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah Newren
t604
4
: new mer
g
e testca
s
es for when index doe
s
n't matc
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newre
n
built
i
n/merge
.
c: fi
x
a b
u
g
wi
t
h tr
i
vial
m
e
r
ges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newren
t7605:
add a t
e
stcase dem
o
ns
t
rating a bug
with triv
i
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah N
e
wren
merge-recursive: Don
'
t r
e
-sort a list whose o
r
de
r
we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
e
rge
-
rec
u
r
s
ive:
F
i
x
virtual merg
e
b
a
s
e for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t60
3
6
: criss-cross + rename
/
re
n
am
e
(1to2)/add-de
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recu
r
sive: A
v
oid unnecessa
r
y file
r
ewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6022: Addi
t
ional
t
ests checking fo
r
un
n
ecessa
r
y u
p
dates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
e
rge-recursive:
Fix spurious 'refusing t
o
lo
s
e untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6022: Add testca
s
e fo
r
sp
u
rious "refusin
g
to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: F
i
x wor
k
ing cop
y
handling f
o
r
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
r
g
e
-
r
e
c
ursive: add handling for
rename/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-re
c
u
r
sive: Have
conflict_rename_
d
elete re
u
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-recursive:
M
ake modify/delete han
d
ling
c
o
de
r
e
u
sable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
m
e
rge-recursive: Consid
e
r
modifica
t
ion
s
i
n rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
C
reat
e
function for m
e
rgi
n
g with branc
h
n
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
m
erg
e
-recursive
:
R
ecord m
o
re da
t
a n
e
eded for merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
ren
merg
e
-
r
e
curs
i
ve
:
Defe
r
r
e
name/rename(
2
to1) handling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-re
c
ursive: S
m
all cleanups for co
n
f
lict_renam
e
_rename_
1
to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursive: Fix rename/rena
m
e(1to2) r
e
solu
t
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recursive: Introduce a merge_file convenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
mer
g
e-recurs
i
ve: Fix
modify/delete resolution in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
me
r
ge-recur
s
i
v
e: When we
d
etect
w
e can s
k
ip
an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive: Pro
v
ide m
o
re info
i
n c
o
nflict mar
k
ers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recursive:
C
leanup and consolidation o
f
rena
m
e_con
f
lic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recurs
i
ve: Consolidate p
r
o
cess_e
n
try() an
d
process_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-rec
u
rsive: Impro
v
e handling
o
f rename t
a
rg
e
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recursive: Add c
o
mme
n
ts ab
o
u
t handling re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
e
rge-recursive: Make dead code
f
or
rename/rename
(
2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
mer
g
e-recursive: Fix deletion o
f
untrac
k
ed
file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Newre
n
merge-recu
r
sive:
S
pl
i
t
upda
t
e_
s
tag
e
s
_
a
n
d_entry; only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newr
e
n
merge-
r
ecursive: All
o
w
m
a
ke_room_for_path() to re
m
ove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive: Split was_tracke
d
() out of would_lose_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
e
wren
merge-recu
r
sive:
S
ave D/F con
f
lict file
n
ames instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-r
e
cursive:
F
i
x code
c
heck
i
ng for D/F conflic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-rec
u
rsiv
e
: Fi
x
sorting order and d
i
re
c
tory chan
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-rec
u
rsive: F
i
x
r
e
c
ursive case with
D
/F conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
r
g
e-recur
s
iv
e
: Avoid wor
k
ing directory changes during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merg
e
-recur
s
ive: Remember to fr
e
e generate
d
unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
m
e
rge-re
c
ursive: Conso
l
idate different
update_sta
g
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
ren
merge-r
e
cursive: Ma
r
k
s
ome d
i
ff_fi
l
espec
s
t
ruct argume
n
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecu
r
s
ive:
Cor
r
ect a commen
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-recu
r
sive: Mak
e
B
U
G message mo
r
e
le
g
ible by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t602
2
:
A
dd testca
s
e
for merg
i
ng a renam
e
d
file with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Ne
w
ren
t6022: New t
e
sts checking for unnecessary up
d
ates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wre
n
t6022:
Remove unnecessary un
t
rack
e
d
f
iles
t
o mak
e
test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewre
n
t6036: criss-cross
+ rename/rena
m
e(1to2)/add-sour
c
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t603
6
: cr
i
ss-cross w/ rena
m
e
/ren
a
me(1t
o
2)/m
o
dify+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6036
:
t
e
s
ts for cr
i
s
s
-cross merges with var
i
ous directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: c
r
iss-cross with
weird cont
e
nt
can f
o
ol git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: Add dif
f
erently resolved modify/
d
e
l
et
e
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
t6042: Add failing testcases for
r
e
name/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6042: Ensure re
n
ame/rename
conflict
s
l
e
ave index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6042: A
d
d tes
t
s for content issues
with
modify/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
r
en
t
6
04
2
:
A
dd a testcase where
u
n
det
e
cted
r
en
a
me
causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6042: Add a pair of c
a
ses where
u
n
detected
r
enames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6042:
A
dd failing testc
a
se for re
n
ame/modify/add-sourc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
t
6
042:
Add a testcase where
g
i
t de
l
etes an un
t
r
a
c
k
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
merg
e
-recursive: W
h
e
n w
e
detect we c
a
n
ski
p
an
u
p
d
ate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah
Newren
t602
2
:
Ne
w
test
c
heckin
g
f
or u
n
n
ecessary
u
pdates
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elij
a
h
Ne
w
ren
t6022
:
New
t
est checking
f
or unn
e
ces
s
ary updates
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elija
h
Newren
Add
t
e
s
t
c
ases
s
howing how pathspecs are ha
n
d
l
ed wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Make rev-list --ob
j
ects work tog
e
ther with pathspe
c
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah
Newren
I
ntroduce
s
ane_unse
t
and use it t
o
ensur
e
proper &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah New
r
en
t780
0
(difftool): a
d
d miss
i
ng &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
7601 (
m
erge-pull-config): add mi
s
s
ing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
r
e
n
t7
0
0
1
(mv): add
missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
601
6
(rev
-
list-graph-simpli
f
y-hi
s
t
ory): add mi
s
si
n
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t5602 (clone
-
remote-exec):
ad
d
missing &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newre
n
t4026 (color):
r
emove
u
n
n
ee
d
e
d and unc
h
ained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Ne
w
r
en
t
4019 (diff-
w
serror): add lots of missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4202 (log): Rep
l
a
c
e '<git-command> || :' wit
h
test_
m
i
ght_fa
i
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Ne
w
ren
t400
2
(
d
iff-basic): use te
s
t_
m
ight_fail fo
r
com
m
an
d
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t100[12]
(
r
e
ad-tree-m-2
w
ay, read_
t
r
e
e_m_u_2way)
:
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4017 (diff-retv
a
l): replace manu
a
l e
x
i
t c
o
de check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newren
t3
0
20
(ls-files-
e
rror-unmatch): remove st
r
ay
'
1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
m
erge-rec
u
rsive:
R
emove redundant path clearing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-re
c
ursive:
Make room for directorie
s
in D/F conflic
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
handle_de
l
ete_modify(): Che
c
k whethe
r
D/F
c
onfl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge_content(): C
h
eck
whether D/
F
confli
c
ts are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
c
o
nflict_rename_rename_
1
t
o
2
(
)
: Fix chec
k
s
for prese
n
c
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
conflict_re
n
ame_delete(): Check
whe
t
her D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
merge
-
recursi
v
e: De
l
ay
m
odify/
d
elete conflicts if
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsi
v
e: Delay
content merging for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h Newren
merge-re
c
ursiv
e
: Delay ha
n
d
ling of rename/delete conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Move
h
andling of double re
n
ame of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
New
r
en
merge-recursive: Move handlin
g
of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recu
r
sive:
A
void doubly
mergin
g
rename/a
d
d conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-re
c
ursi
v
e:
U
pd
a
te merge_co
n
ten
t
()
call
signatu
r
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
N
e
wren
merge-
r
ecursive:
Update
confli
c
t_rename_rename_1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newr
e
n
merg
e
-r
e
cursive
:
Structure p
r
ocess
_
df_en
t
ry(
)
t
o
ha
n
d
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
m
e
rg
e
-recurs
i
v
e
: Have pr
o
cess_entry
(
)
skip
D
/F
or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
m
e
r
ge-recursive:
New function
to assist resolving renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wre
n
merge-re
c
ursive: New data s
t
r
u
c
t
ures for deferring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
erge-recur
s
ive: Move
pro
c
e
s
s_ent
r
y's
conten
t
m
e
r
g
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merge-recursi
v
e: Mo
v
e delete/modify handling
into
dedic
a
te
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newre
n
merg
e
-recursive: Move rename/del
e
te handling into d
e
dicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-recursive
:
Nuke rename/directory
c
onfli
c
t d
e
tection
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
e
wren
merge-
r
e
c
ursive: Rena
m
e conflict_rename_
r
ename*() for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next