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
Git 2.16-rc1
2017-12-22
E
lijah Newren
merge
-
recurs
i
ve:
a
voi
d
incorporatin
g
u
n
co
m
m
i
tted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
m
o
ve index_ha
s
_
cha
n
ges
(
)
fr
o
m builtin/
a
m
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lijah
N
ewren
t6044: recu
r
sive can silen
t
ly incorporate dirty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Ne
w
r
en
strbuf: remove unu
s
ed str
i
ps
p
ac
e
function a
l
ias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
E
l
i
ja
h
N
e
wre
n
merg
e
-recu
r
s
ive: ignore_case
s
houldn't r
e
ject
i
ntentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newren
sequencer: sh
o
w rename progress during cherry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
diff: rem
o
ve sil
e
nt clamp of re
n
am
e
L
i
m
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
i
jah Newren
progress: fix progress meters when dealing with lot
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h N
e
wren
merg
e
-recursive: h
a
ndle addit
i
on of
su
b
mo
d
ule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah
Newren
sequen
c
e
r
: warn wh
e
n internal
mer
g
e may be s
u
boptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
Newren
t6044: new
merge tes
t
c
a
ses for whe
n
i
n
dex does
n
't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newren
m
e
rge-octo
p
us: abort if index does not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewr
e
n
builtin/merge
.
c: fix a bug with trivial m
e
rges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t7605: a
d
d
a tes
t
case demonstr
a
ting a bug wi
t
h trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
r
en
merge-recursive: do not check
wo
r
king copy
w
hen cre
a
t
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
merge-
r
ecu
r
s
ive: remove
duplicate co
d
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Don't re-sort a l
i
st whose ord
e
r
we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursi
v
e: Fix virtual merge ba
s
e
for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
36: criss-cross
+ rename/rename(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merg
e
-
r
e
c
ur
s
i
v
e: Avo
i
d unnecessary file rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
t6022: Add
i
tional
t
ests checking for unnec
e
ss
a
ry updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recur
s
iv
e
: Fix spurious 'r
e
fusing to
lose untr
a
cke
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
022: Add
testcase for spu
r
i
o
us
"
r
efusin
g
to
lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recurs
i
ve: Fix working copy h
a
ndling f
o
r rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-re
c
ursive:
add handli
n
g for rename/rena
m
e
/
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newre
n
merge-recur
s
i
v
e:
Have c
o
n
f
lict_
r
ename_d
e
lete reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rg
e
-recursiv
e
: Make m
o
dify/delete
h
andling code
reusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: C
o
ns
i
der modificati
o
ns
in
r
e
n
ame/ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-recursi
v
e
: Cr
e
ate function fo
r
merging wit
h
branchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recu
r
sive
:
Record more
d
ata needed for merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recu
r
sive: Defer
ren
a
m
e
/rename(
2
to1)
h
andl
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
erge-r
e
c
urs
i
v
e: S
m
al
l
cleanups for conflict_rename_r
e
name_1
t
o2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-re
c
ursive: Fix rename/rename(1to2) reso
l
ution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
merge-rec
u
rsive: Introd
u
ce a me
r
ge_fi
l
e co
n
venience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
New
r
en
merge-recursive: Fix modify/del
e
te reso
l
u
t
ion in t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
ew
r
e
n
m
erge
-
recursi
v
e: When we detect we ca
n
sk
i
p
a
n update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-recursive: Prov
i
de m
o
r
e info in conflic
t
mark
e
rs
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursive:
C
leanup
and
c
on
s
olida
t
ion
o
f r
e
n
a
me_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
er
g
e-r
e
curs
i
ve: Consolidate
p
rocess_ent
r
y() and pr
o
cess_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h N
e
wr
e
n
merge-re
c
ursive: Improve handling o
f
r
e
n
ame targe
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Add
c
o
mm
e
n
t
s
about
ha
n
dling
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
mer
g
e-rec
u
rsive
:
Mak
e
dead co
d
e
for
r
enam
e
/rename(
2
to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
me
r
ge-recu
r
siv
e
: F
i
x
de
l
etion of untracked file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge
-
recursive: Split upda
t
e_stages_a
n
d_entry
;
only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
ah
N
ewren
mer
g
e-recursive: All
o
w make_room_for
_
path() t
o
remov
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newre
n
merge
-
recursive:
S
plit was_t
r
acked() out of
would_lose_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recursi
v
e: Save D/F confl
i
ct filenames
i
nstead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recursive: Fi
x
code checking fo
r
D/F c
o
n
flicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-
r
ecursive
:
Fix so
r
ting
order
a
nd direc
t
ory change
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ec
u
rsive:
Fix recurs
i
ve case
with D/F confli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e
:
Avoid work
i
ng d
i
rectory changes during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-re
c
ursive:
R
emember to free g
e
nerate
d
unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursi
v
e: C
o
nsolidate
d
ifferent updat
e
_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
m
e
rge-recursive: Mark some d
i
ff_fi
l
e
s
pec s
t
ruct ar
g
uments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
m
e
rge
-
recursive: C
o
rrect
a
co
m
ment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive: Make B
U
G
messa
g
e mor
e
leg
i
ble
by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newr
e
n
t6022: Ad
d
testcase for
m
erging a
r
enamed f
i
le with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h Newre
n
t6
0
22: New tests che
c
king for unnec
e
ssary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newren
t6
0
22:
Remove unnecessary untrac
k
ed f
i
les to ma
k
e test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036
:
criss-cro
s
s + re
n
ame/rename(1to2)/add
-
source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
3
6
: criss-
c
ros
s
w/ rename/rename(1to2)/modify+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t60
3
6: tests for criss-cross merges with various dire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
Newren
t6036
:
c
r
i
ss-cross with weird conte
n
t can fool git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6036: Add d
i
fferently r
e
solved
m
o
d
ify/del
e
te conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6042
:
Add
f
ailing testcases for rename/rename/ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6042: E
n
s
ure
ren
a
me/rename conflicts leave
index
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t6042: Ad
d
tests f
o
r
c
o
ntent is
s
ues with modify/
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6042: Add a testcase
w
h
e
re undete
c
ted ren
a
me causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Ad
d
a pair of cas
e
s where
un
d
ete
c
t
ed renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6042: Add faili
n
g
t
estcase for rename/modify/add-so
u
rce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6042: Add a testcase
w
h
er
e
g
it deletes an
u
ntracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
merge
-
recursiv
e
: W
h
en we detect
we can skip a
n
u
pdate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
l
i
jah Newren
t
6022: New test chec
k
ing
for
unnec
e
ss
a
ry updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
t
6022: New test checking for u
n
necessa
r
y
updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
El
i
jah
Newren
Add
t
estcases showi
n
g how pathspecs are han
d
led wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Eli
j
ah Newren
Make
r
ev-list --obj
e
ct
s
work to
g
e
t
h
er with pa
t
h
specs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
Intro
d
uc
e
sane_
u
nset
a
nd use i
t
t
o
ensure
p
r
o
p
er
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah New
r
en
t7800
(
diff
t
ool)
:
add missing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7601
(
m
erge-pul
l
-config
)
:
add mis
s
ing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Newren
t7001 (mv):
add
m
iss
i
ng &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t6
0
16
(
rev-
l
ist-graph-simplify-histo
r
y):
add missin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
t5602 (clone-remote-exec):
a
dd mi
s
si
n
g
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4
0
26 (color):
r
emove unneeded
a
nd unchained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newren
t40
1
9
(diff-
w
serror):
add lots
of mi
s
sin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newr
e
n
t4202 (log):
R
eplace '
<
git
-
command> || :'
w
ith test_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t40
0
2 (d
i
f
f
-bas
i
c): use test_might
_
fail for comma
n
ds
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
t100[12] (read-tree-m-2
w
a
y, read_tree_m_
u
_2way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Newren
t4017 (diff-retval): replace manua
l
exit co
d
e
c
h
eck
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newren
t30
2
0 (ls-f
i
les-error-unmatc
h
): rem
o
ve stray '1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merge
-
r
e
cursive:
R
e
move redundant path clearing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
merge-
r
e
cu
r
sive: Make room for directo
r
ies in D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
r
e
n
h
a
n
d
le_dele
t
e_m
o
dify(): Check whether D/F co
n
f
li
c
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Ne
w
re
n
merge_content
(
):
Che
c
k whether D/F
c
onflicts are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
N
ewren
conflict_renam
e
_re
n
ame_1to
2
(): F
i
x
c
hecks
for
p
r
e
sence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Ne
w
r
e
n
conf
l
ict_
r
en
a
m
e
_delete(): Check wheth
e
r
D
/
F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-rec
u
rsive:
D
elay modify/delete conf
l
icts i
f
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recur
s
ive: Delay conten
t
m
e
rging for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
mer
g
e-r
e
cursive:
D
e
lay han
d
ling of
r
e
n
a
m
e/del
e
te conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
merge-recursive
:
Move handling of
d
ouble rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wre
n
merge-recursive: M
o
ve
h
andling of
d
ouble renam
e
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next