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
perl: generalize the Git::LoadCPAN facility
2018-01-19
E
l
ijah Newre
n
merge-recu
r
siv
e
: add
e
xplanation for src_entry
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah N
e
wr
e
n
mer
g
e-re
c
ursive: fix logic or
d
ering
issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elija
h
N
e
wren
Tighten and correct a few testcases fo
r
merging
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Ne
w
ren
m
e
rge-recursive: avoi
d
incorporating uncommit
t
ed changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah
Newren
mo
v
e
index_has_changes
(
) from bu
i
ltin
/
a
m
.
c
t
o merg
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Ne
w
r
e
n
t6044:
r
ecursive can sil
e
n
tly in
c
orpor
a
te dirty chang
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elij
a
h Newren
strbuf: r
e
move unused
s
t
r
i
pspace func
t
ion al
i
a
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newren
m
e
rge-recursive:
i
gnore_case shouldn't reje
c
t intention
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newren
sequence
r
: show rename progress during cherry pic
k
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Ne
w
ren
d
i
ff: remo
v
e s
i
lent cla
m
p
of renam
e
Limit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
li
j
ah Newren
progress: fix
p
r
ogress
m
eters
w
hen d
e
aling with l
o
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elija
h
Ne
w
r
e
n
merge-recursiv
e
:
handle addition of subm
o
dul
e
o
n
ou
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah N
e
wren
seq
u
encer:
w
arn w
h
en in
t
ernal
merge m
a
y be suboptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t6044: new merge te
s
tcases for
when
i
ndex doesn'
t
match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lij
a
h
Newren
m
e
rge-octopus: abort if in
d
ex does not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah
Newren
bui
l
tin/me
r
g
e
.
c: fix a b
u
g with tr
i
v
i
a
l merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t
76
0
5:
add a testcase demonstrating a bu
g
wit
h
tr
i
v
i
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
N
e
wren
merge-recursive:
d
o not check wo
r
kin
g
copy when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah Newre
n
me
r
ge-recu
r
sive
:
remove duplicate c
o
de
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recu
r
sive: Don't re-sort a li
s
t whos
e
order
we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursive: Fi
x
virtua
l
me
r
ge b
a
se for re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newren
t6036: criss-cross + rename/rename(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
m
erge-r
e
cu
r
s
i
ve: Avo
i
d
u
n
n
e
c
e
s
sary file rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6022: Additional
tests
ch
e
cking for
u
n
necessary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: Fix
s
p
u
rious
'
refusing t
o
lose unt
r
a
cked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Add t
e
stcase for spurious
"
refusing to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newre
n
merge-recursive: Fix w
o
rking
c
opy handling f
o
r rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
merge-recursive: a
d
d handling for rename/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Ne
w
ren
m
e
rge-recur
s
ive: H
a
ve conflict_rename_d
e
le
t
e reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
m
e
r
ge-recu
r
sive:
M
a
k
e mod
i
f
y
/
del
e
te handl
i
ng c
o
de r
e
usable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recur
s
i
v
e
:
Consider modifi
c
ations in rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newren
merge-re
c
u
rsive: Create function for
m
erging with branc
h
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge
-
recursiv
e
:
R
ecord more data needed for
me
r
ging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Ne
w
ren
merge-recursiv
e
: Defer rename
/
renam
e
(2to1) han
d
l
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
Small c
l
e
an
u
ps for conflict_re
n
ame_rename_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
ive: Fix re
n
ame/rena
m
e
(1
t
o2) resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewr
e
n
merg
e
-recursive: In
t
roduce a merge_file convenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recurs
i
ve: Fi
x
modify/d
e
lete resolution in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
ren
merge-r
e
c
u
rsiv
e
:
When we dete
c
t we c
a
n skip an up
d
a
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: Provide mo
r
e info in confl
i
ct ma
r
kers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newr
e
n
merge-
r
ec
u
rsive: Cl
e
anup a
n
d con
s
olidation of
r
ename_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive: Co
n
sol
i
dat
e
process_entry()
a
nd process_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h Newren
merge-
r
ecu
r
sive: Improve handli
n
g of rename t
a
rget
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-r
e
cursiv
e
: Add comments about ha
n
dling
r
e
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
N
e
wre
n
merge-rec
u
r
sive:
M
ake dead
code for
r
e
name/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recursive: F
i
x deletion o
f
u
n
tracked file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
m
e
rge-recu
r
sive:
S
pli
t
updat
e
_stages_and_entry;
o
nly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Ne
w
ren
merge-recursive:
Allow make_room_for_path() to remo
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
en
merge-recur
s
ive
:
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 Newre
n
merge-rec
u
rsive
:
Save
D
/F con
f
lict
f
ilenames inst
e
ad
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
New
r
en
merge-recursive:
F
ix co
d
e ch
e
cking
for D/
F
conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
m
erge-recursive: Fix sor
t
ing ord
e
r and dir
e
ctor
y
c
h
ange
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
N
e
w
r
en
m
e
rge-recursi
v
e: Fix recursive
c
a
se with D
/
F conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
m
e
rge-recursive: Avoid
wo
r
king d
i
rect
o
ry changes during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h Newren
m
erge-
r
ecursive: Remember t
o
free generated uniq
u
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Ne
w
r
e
n
merge-recursive: C
o
nsolidate different
u
pdate_sta
g
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah N
e
wren
merge-recu
r
s
i
v
e: Mark
s
o
me diff
_
filesp
e
c struct argum
e
nts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive: Corre
c
t a com
m
e
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recurs
i
v
e:
M
ake BUG message more
legible
by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022:
A
dd testca
s
e
f
o
r me
r
ging
a renamed fil
e
w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t
6
0
22: New tests c
h
ecki
n
g for unnecessary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t
6
022:
R
e
move unn
e
cessary
unt
r
ack
e
d files to make t
e
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t603
6
: cris
s
-cross + rename/rename(1to
2
)/add-sourc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
3
6: criss-cross w/ rename/rename(1
t
o2)/mo
d
i
f
y+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: test
s
f
o
r criss
-
cross merges with various directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newr
e
n
t
6
036:
c
riss-cross with weird
conte
n
t ca
n
fool git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
36: Add dif
f
erently resolved
m
o
dify/delete
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6042: Add failing test
c
ases
f
o
r re
n
ame/re
n
am
e
/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah New
r
en
t6
0
42
:
E
n
su
r
e re
n
ame/
r
ena
m
e
conflicts leave index an
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6042: Add tests for content issu
e
s
with modify
/
re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
e
wre
n
t6042: Add a testcase
w
here unde
t
ected
ren
a
me causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t
6
042: Add a pair of cases where un
d
etecte
d
renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add fail
i
n
g testcase f
o
r r
e
name/modify/a
d
d-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6042: Add a tes
t
cas
e
where git d
e
letes
a
n
untrac
k
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elij
a
h N
e
wren
me
r
ge-recursive: When we
de
t
ect we can sk
i
p an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elij
a
h
N
ew
r
en
t6022:
New
test checking for unnecessary updates
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Ne
w
ren
t602
2
: New test ch
e
cking f
o
r unneces
s
ary updat
e
s
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Add test
c
a
se
s
showing how paths
p
ecs
a
r
e
h
a
ndled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
E
lijah
N
ewren
Make
r
ev-list --o
b
j
e
c
t
s
work togeth
e
r with pathsp
e
cs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h New
r
en
I
n
troduce sane_
u
nset
a
nd use it to ensure
p
r
o
per &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t
7
800 (
d
if
f
tool): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Newren
t7601 (mer
g
e-p
u
ll-conf
i
g):
a
dd missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
ren
t70
0
1 (mv): add
m
issing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ija
h
Newr
e
n
t6016 (rev-l
i
st-graph-simplify-hi
s
t
ory)
:
add mis
s
ing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t5602 (clone-remo
t
e-exec
)
: add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t4026 (
c
olor)
:
remove unneeded and u
n
chained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
w
r
e
n
t40
1
9 (diff-w
s
er
r
or): add lots of missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t4202 (log): Rep
l
ace '<git-comm
a
nd>
|
| :'
with
te
s
t_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
i
jah Newren
t4002
(dif
f
-basic): use test_might_fail f
o
r
co
m
mands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewr
e
n
t1
0
0[12]
(read-
t
ree-m-2way, re
a
d_tree_m_u
_
2wa
y
): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
t401
7
(d
i
ff-retval): replace
manual exit code check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newr
e
n
t3020 (ls
-
f
i
les
-
error-unmatch): remove
stray '1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-re
c
ursive: R
e
mo
v
e re
d
und
a
n
t
path
clearing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
m
e
r
ge-recursive: Make room for dir
e
ctorie
s
in D/F c
o
n
f
li
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
j
ah Newren
h
a
n
dle_dele
t
e
_
m
odify()
:
Ch
e
ck whether D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h New
r
en
merge
_
c
on
t
ent(): Check whether D/F
c
onflicts
a
re still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
confl
i
ct_rename_rename_1to2(): Fix c
h
ec
k
s
for presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
conflic
t
_rename_delete():
C
heck whet
h
er D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
ewre
n
merge-recursive:
D
elay
modify/delete confli
c
ts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recursive: Delay c
o
nten
t
mer
g
ing for renam
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next