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
fetch tests: re-arrange arguments for future readability
2017-12-22
E
l
ijah N
e
wren
merge-recur
s
ive: avoid
i
ncorporating un
c
ommitted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
move
i
n
dex_has_
c
h
anges() f
r
o
m
b
u
iltin/am
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
li
j
ah Newren
t6
0
44: rec
u
rsive
c
an sile
n
t
l
y
i
n
corpor
a
te dirty change
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
E
lijah Newren
strbu
f
:
r
e
move unused strips
p
ace f
u
nction alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newren
merge-rec
u
r
s
i
v
e:
i
gn
o
re_case shouldn
'
t reject inte
n
ti
o
n
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newre
n
sequenc
e
r
:
show
r
e
name progre
s
s
d
uri
n
g cher
r
y
p
i
cks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h Newren
diff: r
e
move silen
t
clamp of
r
enameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
p
r
ogress
:
fix progress meters when
dealing with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newre
n
merge-recursive
:
h
a
ndle add
i
tion of
s
u
bmodule o
n
ou
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
E
lijah Newren
sequ
e
nc
e
r: warn w
h
en in
t
ernal
m
erge may
b
e subop
t
im
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newren
t6044:
new m
e
rge testcases for when in
d
ex doesn't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newre
n
merge-octopus: abort
i
f ind
e
x d
o
es not
m
a
t
c
h HEA
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
ja
h
Newren
builtin/mer
g
e
.
c
: fix a bug
w
i
t
h trivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newren
t7605:
a
dd
a
testc
a
s
e demonst
r
ating a bug with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-recursive: do
n
ot check
w
o
r
ki
n
g copy w
h
en creatin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah Newren
merge-recursive: remov
e
d
up
l
icate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah New
r
e
n
merge-recursive: Don'
t
re-sort a l
i
st whose orde
r
w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Ne
w
ren
me
r
ge-recursive:
Fix vi
r
t
u
a
l
m
erge base for r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t
6
0
3
6: criss-cro
s
s + rename/rename(1
t
o2)/add-
d
est
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: A
v
oid
u
n
necessar
y
file rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
t6022: Additiona
l
tests checking for
u
n
ne
c
es
s
ary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
c
u
rsive: F
i
x
spuri
o
us 'refusing to lose u
n
tr
a
cked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6022: Add tes
t
case fo
r
spuriou
s
"re
f
using to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive
:
Fix wor
k
ing copy handling for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merg
e
-recurs
i
ve: add handling f
o
r ren
a
me/rename/ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newre
n
merge-r
e
cu
r
sive:
H
a
v
e
confl
i
ct_renam
e
_dele
t
e r
e
use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
m
e
rg
e
-recursi
v
e: Make modif
y
/d
e
le
t
e handling code r
e
usa
b
le
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
e
w
r
e
n
merge-recu
r
si
v
e: Cons
i
der mod
i
fi
c
ati
o
ns in
rename/rena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursive: C
r
eate function for m
e
rging with br
a
nchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
erge-recur
s
ive: R
e
c
o
rd more
data n
e
e
ded
f
or m
e
rging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Defer rename/rename(2to1) hand
l
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
m
e
rge-r
e
cursive: Small cleanu
p
s for conf
l
ict_rename_re
n
ame_1
t
o2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursive:
F
ix rename/rename(1to2) resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-rec
u
rsive: Intro
d
uce a me
r
ge_file con
v
e
nie
n
c
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
erge-recursiv
e
: Fix modi
f
y/
d
elete
r
esoluti
o
n i
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursiv
e
: W
h
en we
d
etect we can
s
kip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursive
:
Provide more
i
n
f
o
in con
f
lic
t
markers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
m
e
rge
-
recursive:
C
leanup a
n
d cons
o
lidat
i
o
n
of r
e
nam
e
_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-
r
e
c
ursive: Consolidate process_
e
n
try()
and process_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-r
e
cursive: Imp
r
ov
e
handling of rename target
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recu
r
sive: Add
com
m
ents abo
u
t ha
n
dling rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursive: Make dead cod
e
for rename
/
r
e
name(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h N
e
wren
me
r
g
e
-recursive: Fix deletion of un
t
racked file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
m
e
rge-recursive: Split update_sta
g
es_and_ent
r
y; onl
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-re
c
urs
i
ve:
A
llow make_room_for_path(
)
to r
e
move
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
mer
g
e-
r
ecursive
:
Spl
i
t was_tracked() out of would_lose_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-re
c
ursive: Save D/F c
o
n
f
lict
filenames ins
t
ead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merg
e
-re
c
ursive: Fix code
c
h
e
cking for D/F conflic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive: Fix sorti
n
g
order and
directory change
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
merge-recursi
v
e
:
F
ix rec
u
rs
i
ve case with D/F conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-r
e
c
ursive:
A
v
oid working di
r
ectory
changes
during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
Newren
me
r
ge-recur
s
ive: Remember to free generate
d
unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merg
e
-recursive: Con
s
olidate dif
f
erent update_sta
g
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
en
merge-
r
ecursive: Mark some diff_fi
l
esp
e
c str
u
ct arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
ah Newre
n
merge-re
c
ursive: Corre
c
t a c
o
m
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newren
merge-rec
u
rsi
v
e
: Make
B
U
G mess
a
g
e
mor
e
legible by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
e
wr
e
n
t6022: Add
tes
t
case
for merging a re
n
amed file with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t
6
0
22:
New tests checking for un
n
ecessary updat
e
s of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
022
:
Remove u
n
necessary untracked files
t
o make test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6036
:
criss-cro
s
s + r
e
name/ren
a
me
(
1to2)/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
r
en
t60
3
6
: criss-cross w
/
r
e
name/rena
m
e(1to2)/modif
y
+r
e
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Newren
t603
6
: tests for criss-cross merges w
i
th various direct
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss-cr
o
ss
w
ith we
i
rd
c
onten
t
can foo
l
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah New
r
en
t6036: Add differently
resol
v
ed
m
o
di
f
y/delete
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t
6042:
Add failing testcases
f
o
r
r
ename/rename/a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6042: Ensure rename
/
rename
con
f
li
c
ts le
a
ve index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
4
2: Ad
d
test
s
for cont
e
nt
i
ss
u
es with modify
/
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6042:
Add
a test
c
ase
w
her
e
undet
e
cted rename causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6042: Add a
pai
r
o
f
c
ase
s
w
h
ere undetected
r
e
names
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6042
:
Add failing testcase for rename
/
modify/a
d
d-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6042: Add a testcase where
g
it delet
e
s
an un
t
racked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Eli
j
ah Newren
mer
g
e-re
c
ursive: When we de
t
ect we can skip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
t60
2
2:
N
e
w test checking for unnecessary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
l
ijah Newr
e
n
t60
2
2:
New test checking
for unnecess
a
ry u
p
d
a
te
s
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Ad
d
testca
s
e
s
sh
o
w
i
n
g
how
p
athsp
e
cs are handled
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah N
e
wren
Make re
v
-
l
ist --o
b
jects work
t
ogether w
i
th pathsp
e
cs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
I
ntroduce sane
_
unset and use it to e
n
sure
pr
o
per &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
li
j
ah Newren
t78
0
0 (
d
ifft
o
ol): add m
i
ssing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Newr
e
n
t
7601 (merge-pull-
c
onfig): add missi
n
g
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7001 (mv): add missin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Newren
t6
0
16 (rev-list-gr
a
ph-simplify-history):
add missing &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t5602 (cl
o
ne-remote-exec): ad
d
missing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4026 (color
)
: remove u
n
n
eede
d
and unchain
e
d c
o
mmand
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t
4
01
9
(d
i
ff-wserror): a
d
d
lots of mis
s
ing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4202 (log): Rep
l
ace
'
<
g
it
-
command
>
|| :' with
t
e
st_m
i
ght_fa
i
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Ne
w
r
e
n
t4002 (
d
iff-basic): use te
s
t_m
i
ght_fa
i
l for comm
a
nds
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
ren
t100[12] (read-
t
r
ee
-
m
-
2way, rea
d
_tree_m_
u
_2way): ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah New
r
en
t4017 (
d
iff-retval): replace manual exit code chec
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
E
l
ij
a
h
Newren
t
30
2
0
(ls-files-error-unmatch
)
: r
e
mo
v
e stra
y
'
1
' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-
r
ecursive:
R
emove
r
e
d
und
a
nt path c
l
eari
n
g
f
or
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
e
w
ren
merge-recursi
v
e
:
Ma
k
e room for d
i
rectories in D/F confl
i
cts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
h
andle_delete_modi
f
y
(
):
C
heck
whether
D
/F c
o
nflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
Newren
merge_con
t
ent(): C
h
eck whe
t
her D/
F
conflicts
a
re still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
c
o
n
f
lict_rename_rename_1to2():
Fix checks for pr
e
sence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah N
e
wren
conf
l
ict_rename
_
delete(): Check whet
h
e
r D/F conf
l
icts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
merge-recursive:
D
elay modif
y
/delete
c
onflict
s
if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
me
r
ge-recursiv
e
:
D
e
l
a
y content merging fo
r
renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newre
n
merge-recursive: D
e
l
a
y
handl
i
n
g
o
f r
e
name/de
l
ete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-r
e
cursive: Move ha
n
dling of do
u
ble rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
merge-recur
s
i
ve: Move han
d
l
ing of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next