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 'tb/test-lint-wc-l'
2017-12-22
Elijah
Newren
merge-r
e
c
ursive: av
o
id incorporating uncom
m
itted
changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elija
h
N
ewren
mo
v
e inde
x
_has_changes()
fr
o
m bui
l
t
i
n
/
am
.
c to m
e
rge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t6044:
recursive
ca
n
silent
l
y i
n
c
orp
o
rate dirty cha
n
ges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
strbuf:
r
emo
v
e unused stripsp
a
ce
function a
l
ia
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elij
a
h Newre
n
merge
-
recursive:
i
gnore_case
sho
u
ldn't
r
eject inten
t
ional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah Newr
e
n
sequencer: show rename progress during cherry
p
i
cks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
d
i
ff: remove
s
il
e
nt clamp of renameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
li
j
ah Newren
p
ro
g
res
s
:
fix prog
r
ess meter
s
when dealing
w
ith
lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah New
r
en
merge-recursive: han
d
le addit
i
on of submodu
l
e on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newre
n
sequence
r
: wa
r
n w
h
en inte
r
nal
m
e
rg
e
may b
e
suboptima
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewr
e
n
t6
0
44: new merge testcases
for when inde
x
doesn'
t
match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-octopus:
a
bor
t
if index does not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah
N
e
wren
builtin/m
e
r
ge
.
c: fix
a bug with
t
rivial
m
erges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wr
e
n
t7605: add a t
e
stcase de
m
on
s
tr
a
ting a bug
with triv
i
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newr
e
n
merge
-
recursi
v
e: do not check working copy when
c
reating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah Newren
merge-recurs
i
ve: remove dup
l
icate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recursive: Don't re
-
sort a li
s
t w
h
ose order w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge
-
re
c
u
r
s
iv
e
: Fix vir
t
ual merge base f
o
r re
n
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6036
:
c
ris
s
-cross +
r
ename/rename(1to2)/
a
dd-
d
e
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Ne
w
ren
merg
e
-
r
ecur
s
ive: Avo
i
d un
n
ecessary file rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah New
r
e
n
t6022: Additional
tests che
c
king fo
r
unnec
e
ssary update
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge
-
recursive:
Fix
s
pur
i
ous 'r
e
fusing to
l
o
se un
t
r
ac
k
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6022: Add testcase for s
p
urious
"
r
efusing to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h Newren
merge-recursive:
F
ix wor
k
i
n
g copy hand
l
i
ng
for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
merg
e
-recurs
i
ve:
add handling for rename/rename/a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recur
s
ive: Have conflict_rename_dele
t
e reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
N
ewre
n
me
r
ge
-
recursive: Ma
k
e modify/d
e
lete handling c
o
de re
u
sable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
merg
e
-r
e
c
u
r
sive: Consider mod
i
ficatio
n
s
i
n rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
m
erge-recursive: Create
function for merg
i
ng wit
h
br
a
nchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merg
e
-recursive
:
R
e
cord mo
r
e
d
a
t
a ne
e
de
d
fo
r
m
e
r
g
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
ive: Defe
r
rename/rena
m
e(2to
1
) handling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive
:
Small cle
a
nups for
co
n
flict_renam
e
_r
e
n
a
me_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ew
r
en
merg
e
-recursive: Fix rename/ren
a
me(1to2
)
resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
r
g
e-
r
ecursive: In
t
roduce
a
merge_file convenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e: Fix modify/delete r
e
so
l
ut
i
on
i
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
mer
g
e-recursive:
W
h
e
n we
de
t
ect we can s
k
ip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
m
e
rge-recursive: Prov
i
d
e
mor
e
info in conflict m
a
rker
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-recursi
v
e:
C
le
a
nup and consolidati
o
n of
renam
e
_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newre
n
merge-recursi
v
e: Co
n
s
o
lidate proce
s
s
_entry() and process_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
mer
g
e-r
e
c
ur
s
ive: Improve h
a
ndl
i
ng of rename target
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-r
e
cursiv
e
: Add comme
n
ts about
h
andling
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recursive:
Ma
k
e dead code f
o
r ren
a
me/r
e
n
am
e
(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recur
s
ive: Fix delet
i
o
n
of u
n
t
r
acked
f
ile in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-re
c
u
r
sive
:
S
plit
updat
e
_stages_a
n
d_entry; only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newre
n
merge-rec
u
rsive: Allow m
a
k
e
_room_
f
or_path
(
)
to rem
o
ve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Split was
_
tracked(
)
out of w
o
uld_lose_
u
ntra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
Ne
w
ren
merge-recursive: Save
D/F
confl
i
ct filenames in
s
te
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
c
ursive: Fix code ch
e
c
k
ing for D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Ne
w
ren
merge-recursive: Fix
s
ortin
g
or
d
er
a
n
d
directory
c
h
ange
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
:
Fix
recurs
i
ve case with D/
F
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
ren
me
r
ge-r
e
c
u
r
sive
:
A
v
oid work
i
ng direct
o
ry changes d
u
ring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Ne
w
r
en
merge-recursive: Remem
b
er to free ge
n
erate
d
unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h New
r
en
merge-
r
ecursi
v
e: C
o
nsolida
t
e dif
f
eren
t
u
pdate_sta
g
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wr
e
n
m
erge-recursive: Mark some
d
iff_filespec
s
t
r
uct argume
n
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-recursive: Correct
a co
m
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
a
h
Newren
merge-recursi
v
e: Mak
e
BUG message more legible
b
y addin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Ne
w
ren
t6022: Add testcas
e
for merging a renamed f
i
l
e wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newre
n
t6022: New
tests checking
f
or unnecessary
updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah New
r
en
t6022: R
e
move u
n
ne
c
e
s
sary untracke
d
files
t
o
make te
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t6036: criss-cro
s
s + rename/
r
e
n
ame(
1
to
2
)/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6036: cri
s
s-cross
w
/ rename/re
n
ame(1to2)/modi
f
y+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6036: tests f
o
r criss-cr
o
ss
merges with various directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
t6036:
c
r
is
s
-cross with weird conte
n
t can foo
l
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t603
6
:
A
d
d differently re
s
olved
m
odify/delete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
en
t
6
042
:
Add fai
l
in
g
test
c
ases for re
n
ame/ren
a
me/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newre
n
t6042: Ensur
e
r
e
name/r
e
name conf
l
i
cts
l
eave
i
ndex and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
4
2: A
d
d tests for c
o
ntent issue
s
wi
t
h modify/
r
enam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newren
t6
0
42:
Add a testcase where undetected rename
causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add a pair of cases where undetect
e
d ren
a
mes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newre
n
t6042: A
d
d failing
t
es
t
case
for
rename/modify/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add a testcase where g
i
t deletes an untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
lijah Ne
w
ren
me
r
ge-recursiv
e
: When we detect we can
s
kip
an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah New
r
en
t6022: New test
c
he
c
king
for
unneces
s
ary
updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah N
e
wren
t6022:
N
ew test che
c
king for
unnecessary
u
pdates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Add tes
t
cases s
h
owing how path
s
pe
c
s are ha
n
d
l
ed with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elij
a
h Newre
n
Make r
e
v-list
-
-
o
bjects work
t
o
gether with
p
athspe
c
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
In
t
ro
d
uce sane_unset
a
n
d use
it to
ensure proper &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Newren
t7800 (di
f
ftool
)
: ad
d
missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
t7601 (merge-pull-confi
g
)
:
add m
i
ssing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lija
h
Newren
t7001
(mv
)
: ad
d
mis
s
ing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah
N
ew
r
en
t6016 (rev-lis
t
-grap
h
-simplify-history
)
: add mis
s
in
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t5602 (clone-re
m
ote-ex
e
c):
add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4026 (co
l
or): remove
u
nnee
d
ed and unchained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Newren
t4019 (diff
-
w
serror): add lots of missing &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t
4
2
0
2 (log
)
: Rep
l
ace '<git-comm
a
nd> ||
:'
w
i
t
h
test_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
e
w
r
en
t
4
0
02
(diff
-
basic):
use test_m
i
ght_fa
i
l
f
or
commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah
Ne
w
ren
t100[12] (read-
t
ree-
m
-
2
way,
r
e
ad_tree_m
_
u_
2
wa
y
):
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah
N
ewren
t4017 (diff-r
e
tval):
r
eplace manual exit c
o
de c
h
e
c
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newren
t30
2
0 (
l
s
-
files-error-u
n
matc
h
): remove stray '1
'
fro
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah Newre
n
merge-recu
r
sive: Remove re
d
undant pa
t
h clear
i
ng for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
Newren
m
e
rge-re
c
ursive: Make
r
oom fo
r
d
irectories in D/F conflict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
h
andle_delete_modif
y
(
): Check
whe
t
her
D
/F c
o
nfl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge_content(): Check wh
e
ther D/F confli
c
ts
are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
conf
l
ict_rename_rename_1to2(): Fix checks for presenc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
conflict_rena
m
e_delete(): Check
whether D/F co
n
fli
c
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
m
erge-
r
ecursive: Dela
y
modif
y
/
delete conflicts if
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
m
erge-recursive: Delay content merging
for r
e
names
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
wren
m
erge-rec
u
rsive: Delay handling of
rena
m
e/d
e
lete confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
ewren
merge-recu
r
siv
e
: Move h
a
ndling of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
merge-recursive: Move ha
n
dling of doub
l
e rename
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next