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
Git 2.15.3
2017-11-15
Eli
j
ah Newren
merge-recursive: handle add
i
tion of su
b
modul
e
on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
w
re
n
t6044: new merge testc
a
ses
f
o
r when index doesn't ma
t
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah New
r
en
m
erge-octopus: abort if index does
n
o
t
m
atch HEA
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
bu
i
ltin/merge
.
c: fix a bug with t
r
ivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
t76
0
5
: add
a testcase demonstrating a
bug with trivia
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h
N
e
wren
merg
e
-r
e
cursive: do
n
ot ch
e
ck work
i
ng copy
when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-re
c
ur
s
ive:
r
emove
d
upli
c
ate co
d
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge
-
r
e
cursive: Don't re-sort a list whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
e
w
r
en
mer
g
e-recu
r
sive: Fix vi
r
tual merge base fo
r
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6036: cris
s
-
c
ross +
rename/re
n
a
m
e(1to2)/ad
d
-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-rec
u
rsi
v
e: Avoid unnecessary fi
l
e rewrite
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6
0
22:
Additional tests ch
e
c
king for unnecessary
u
pdates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h
N
e
wr
e
n
m
erge-recursive: Fix
s
purio
u
s 'refusing to lose unt
r
acked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wre
n
t6022: Add
t
e
stcas
e
for
spurious "refusing to
lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
e
r
g
e-recursive: Fix working c
o
py handling f
o
r rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recur
s
i
ve: a
d
d
h
andling f
o
r
rename/rename/
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-re
c
ursive
:
Have conflict
_
rename_delete
r
euse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive
:
Make modify/delet
e
handling
c
o
de
r
eusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Consider modificati
o
n
s
in r
e
n
a
me/
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-r
e
c
u
r
sive: C
r
eate function for mer
g
i
ng w
i
th branchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
ren
merge-recursive:
Record more data needed fo
r
me
r
ging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive: D
e
fer rename/rename
(
2t
o
1)
han
d
l
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recursi
v
e
: Small cleanups fo
r
c
o
nfli
c
t_ren
a
me
_
rena
m
e_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
merge-
r
ecursi
v
e: Fix renam
e
/rename(
1
to2)
reso
l
ution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Ne
w
r
e
n
me
r
ge-recur
s
ive:
Introduce a mer
g
e_
f
il
e
con
v
enience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive
:
Fix mo
d
i
fy/delete resolution
in t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursive: When we detect we can skip
a
n update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
ah Newren
merge-recur
s
ive: Provide more inf
o
in conf
l
i
ct markers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
ewren
merge-recursive: Cleanup and
c
onsolidati
o
n
o
f rename_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recursive: Consolidate
p
ro
c
e
s
s_entry() and pr
o
cess_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
ewren
merge-
r
ecursive:
I
m
prove handling of rename target
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recurs
i
ve:
Add comme
n
ts about h
a
n
d
l
ing rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h
Newren
mer
g
e-recursive: Make
dead
code fo
r
rename/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-
r
ecursive: Fix deletion of untracked file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
e
wre
n
mer
g
e-recursive: Spl
i
t
u
p
d
ate_stages_an
d
_entry;
o
nl
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recur
s
ive
:
A
l
l
ow mak
e
_
r
oom_for_path() to rem
o
ve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
a
h Newren
mer
g
e-recur
s
ive: Split w
a
s_tracked() ou
t
of
w
ould_lose_unt
r
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
m
e
rge-recursive:
S
ave
D
/
F conflict filenames in
s
tead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
mer
g
e
-
r
e
cursi
v
e: Fix code ch
e
ck
i
ng f
o
r D/
F
conflict
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
Fix sorting orde
r
and
d
ire
c
tory
change
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recursive: F
i
x
r
ecursive case
w
i
th D/F conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recu
r
s
i
ve: Avoid w
o
rking directory changes
d
uring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-r
e
cur
s
ive: Remembe
r
to
f
r
e
e
generated
u
niqu
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recursive: Consolida
t
e different update_stag
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
New
r
en
merge-re
c
ursi
v
e: Mark some diff_file
s
pe
c
stru
c
t ar
g
uments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ew
r
en
merge
-
recursive: Correct a comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
m
e
rg
e
-recursive:
M
a
k
e B
U
G messa
g
e
more l
e
gible by
adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6022: Add te
s
tc
a
se for merging a
renamed file wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
22: New tests checkin
g
fo
r
unnec
e
ssary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022:
R
emo
v
e
u
nnecess
a
ry un
t
racke
d
files to make
t
es
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6036: criss-cro
s
s
+
rename/rename(1to2)
/
add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
03
6
: criss-cross w/ rename/rename(1to2)/modify
+
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6036: tes
t
s
f
o
r cris
s
-cross
m
e
rges with
v
arious directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
036: criss-c
r
oss wi
t
h weird c
o
ntent can fool git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: Add diffe
r
ently resolved modify/delete co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add failing
t
es
t
c
ases
f
or renam
e
/rename/
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6042: Ens
u
re r
e
na
m
e/re
n
ame conf
l
i
c
ts l
e
ave index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t
6042: Add t
e
sts for con
t
ent
i
ssu
e
s with mo
d
ify/rena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t60
4
2: Add a t
e
stca
s
e where undetecte
d
renam
e
cau
s
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6042:
A
dd
a
pa
i
r of c
a
s
e
s
where
undetected ren
a
mes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6042
:
Ad
d
failing tes
t
case fo
r
rename/mo
d
ify
/
add-
s
o
urce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t604
2
: Add
a testcase where git deletes an untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
El
i
ja
h
Newre
n
merge
-
rec
u
rsive: When we
d
etec
t
we c
a
n
skip a
n
update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
El
i
j
ah Newren
t602
2
: New
t
e
st
c
hecking for u
n
nec
e
ssary up
d
ates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elij
a
h Newren
t6022
:
N
ew tes
t
ch
e
cking for unnec
e
ssary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Ne
w
ren
Add testcases showi
n
g how pathspecs ar
e
handled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Make rev-list
-
-o
b
je
c
ts
work
togeth
e
r with
p
athsp
e
cs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
Introduce sa
n
e_unset and use
it to ens
u
r
e proper
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Ne
w
ren
t7
8
00 (diffto
o
l): a
d
d missing &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t7601 (merge-pull-
c
o
n
fig):
a
d
d
mi
s
sing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
700
1
(mv)
:
a
dd mi
s
sing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah New
r
en
t6016 (rev-lis
t
-graph
-
simplify-history
)
: add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t5602 (c
l
one
-
remot
e
-exec): add mis
s
ing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
a
h
Newren
t
4
026 (color): remove unneeded and unchained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t4019 (diff-wserror): a
d
d
lots o
f
m
issing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
t4202 (log): Rep
l
ac
e
'<git
-
command
>
|| :' with
t
e
s
t_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah New
r
en
t
4002 (diff-basic)
:
u
s
e t
e
st_might_fail for commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
New
r
en
t100[12] (read-tre
e
-m-2way, re
a
d_t
r
ee_m_
u
_2wa
y
): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h N
e
w
r
e
n
t4017
(diff-retval)
:
r
e
place
m
an
u
a
l
e
xit code check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elija
h
Ne
w
ren
t3020
(
ls-file
s
-
er
r
or-unmatch): remove st
r
a
y '1' fr
o
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newr
e
n
merge-recursive: Remove redundant path clearing
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
r
ge-recursive: Make roo
m
for direct
o
ries i
n
D/F c
o
nflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
ren
h
a
ndle
_
delete_modify(): Check
w
hether D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lij
a
h N
e
w
ren
merge_content(): Ch
e
ck whe
t
her D/
F
confl
i
cts are s
t
ill
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
conf
l
ict_ren
a
me
_
r
ename_1to2()
:
Fix
c
h
ecks for p
r
esence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Ne
w
ren
conflict_r
e
name_de
l
ete(): Check
whether D/F conf
l
icts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
e
n
m
e
r
ge-recursiv
e
: D
e
lay modify/dele
t
e confli
c
ts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merg
e
-recursive: Delay
c
o
nt
e
nt
merging
f
or renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Ne
w
ren
merge-recursive: D
e
lay handlin
g
of re
n
ame/
d
elete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
e
n
merge-recurs
i
v
e: Move handling of do
u
ble renam
e
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
Newren
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 Ne
w
ren
merge-recursive
:
Avoid
doub
l
y merging
rename/add conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
w
ren
merge-re
c
ursive: Update merge_content() call s
i
gna
t
ure
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
mer
g
e-recursive
:
Up
d
ate
conflict_rename
_
r
ename_1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge
-
re
c
u
r
s
ive: Structure
proc
e
ss_df_entry() to
handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
mer
g
e-re
c
u
r
siv
e
: Ha
v
e pr
o
c
ess_ent
r
y() s
k
ip D/F o
r
renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
ja
h
Newren
merge-recursi
v
e: New function t
o
assist
r
e
solving re
n
am
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-recurs
i
ve: New data structures for deferring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah N
e
w
ren
m
e
rge-rec
u
rsive: Move process
_
entry
'
s content
m
erging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
merge-r
e
cursive: Move dele
t
e/modify handling int
o
dedicat
e
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next