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
t3404: add test case for abbreviated commands
2017-11-15
Elijah Newren
m
erge-recursive: han
d
le addi
t
ion of su
b
mo
d
ule on
our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah
Newren
t
6
0
44:
n
ew merge tes
t
cases
f
or when index doe
s
n't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-
o
ctopus: abort
if index
does not ma
t
ch HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah Newre
n
b
uiltin/
m
erg
e
.
c: fix a
bug wit
h
trivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newre
n
t7605: add a testcas
e
dem
o
nstrating a bug with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
Newren
merge-
r
ecursive: do not
c
h
eck wo
r
king cop
y
wh
e
n creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
ja
h
Newren
m
e
rge-recursive: remove dup
l
i
c
at
e
code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
me
r
ge-recursive: Don't re-sort a list whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
me
r
ge-rec
u
r
siv
e
: F
i
x vir
t
ual
m
erg
e
ba
s
e for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6036: cri
s
s-
c
ross + rename/ren
a
m
e(1to2)
/
add-
d
est
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e
: Avoid unne
c
essa
r
y file rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6022: Additional tests checking for
unnecess
a
r
y updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
erge-re
c
urs
i
ve
:
Fix spu
r
ious 'refusi
n
g to lose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Ad
d
testcase f
o
r spurious "refusing to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge
-
recursive: Fix working copy handling
for
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recurs
i
ve: add
h
a
ndling
f
o
r rename/r
e
name/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recurs
i
ve: Have
c
o
nfl
i
ct_r
e
name_delete reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
m
erge-recursiv
e
:
M
ake modify/delete hand
l
ing code reusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-
recur
s
i
v
e:
C
o
n
sider mo
d
ification
s
in rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
ewren
merge
-
recursive: Create f
u
nction for merging w
i
th branc
h
n
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
ah Newren
m
erge-
r
ec
u
rsive:
Rec
o
rd more data n
e
eded fo
r
m
erging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
me
r
ge-recu
r
sive: Def
e
r re
n
ame/rename
(
2to1) handl
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive: Small cl
e
anups for conflict_rename
_
rename_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-rec
u
rsive:
F
i
x rename/rename(1to2) resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive: Introduce a merge_file conven
i
ence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
mer
g
e-
r
ecurs
i
ve:
F
ix modify/del
e
te resolu
t
ion in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h N
e
wren
merg
e
-recursi
v
e: Whe
n
w
e
detec
t
we can skip an
up
d
ate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recursive: Pr
o
v
ide more info in
conflic
t
markers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
m
e
r
g
e-recursive: Cl
e
anup
a
n
d consolidation of
re
n
ame_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
i
v
e: Cons
o
lidate process_
e
ntry() and pr
o
cess
_
df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewre
n
merge-recu
r
sive: Improve handling of re
n
ame ta
r
get
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
mer
g
e
-
recur
s
ive:
A
dd co
m
ments about h
a
ndling ren
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
m
e
rge-r
e
c
u
r
s
ive:
M
ak
e
d
ead code for re
n
am
e
/r
e
nam
e
(2
t
o
1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-r
e
c
u
r
s
iv
e
:
F
ix
d
ele
t
i
on of u
n
tracked file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
ren
merg
e
-recursive: Split update_stages_
a
nd_
e
n
try; o
n
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
m
erg
e
-recursive: All
o
w
m
ak
e
_room_for_
p
ath() t
o
remove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursive: Spl
i
t was_tracked() out of wou
l
d_los
e
_
u
ntra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
New
r
en
merge
-
r
e
cursive: S
a
ve D/F conflict filena
m
es
instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
Newren
merg
e
-recursive: Fix c
o
d
e chec
k
ing for D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
me
r
ge-
r
ecurs
i
ve
:
F
ix sorting ord
e
r
and directory change
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recursive: Fix recursive
cas
e
with D/F conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h
Ne
w
r
e
n
merge-recursiv
e
: Avoid working directory
changes during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
ren
me
r
g
e-re
c
ursive:
R
e
m
e
m
ber to free genera
t
ed uniq
u
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-re
c
ur
s
iv
e
:
C
onsolidate different up
d
ate_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
merge-recursive
:
Mark some diff
_
filespe
c
struct arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-re
c
ursi
v
e: Correct a comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
ren
me
r
ge-recur
s
ive:
Make BUG message m
o
r
e legible by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6022: A
d
d testcase for merging a
re
n
am
e
d fi
l
e
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6022: New tes
t
s ch
e
cking for unnecessary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ew
r
en
t6022: Remove unnecessary untracked files to make te
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036:
c
r
i
ss-cross + rename/rename(1to2)/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Ne
w
ren
t6036: cris
s
-cros
s
w/ rename/rename(1to
2
)/m
o
d
i
f
y+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
ewren
t
6
036
:
test
s
for
c
ris
s
-cross m
e
rges wi
t
h various directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t
6036: criss-cross with weird
c
ontent can fool git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6036: A
d
d d
i
fferently res
o
l
v
ed modi
f
y/de
l
ete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
0
42: Add
failing
t
estcases f
o
r
r
e
n
ame/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
0
42: Ensure re
n
a
m
e/renam
e
conflicts leave
i
ndex and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6042: Add tests
for con
t
e
nt issu
e
s with mo
d
i
fy/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t604
2
: Add a testcase w
h
e
re undetected re
n
ame causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t
6
042: Add a pair
of
c
ases where undete
c
ted
r
enames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
t6042: Add failin
g
testcase
for rename/modif
y
/a
d
d-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
t6042: Add a tes
t
case where git deletes
a
n
u
n
t
racked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Ne
w
re
n
merg
e
-re
c
ursive
:
When we detect we ca
n
s
k
ip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elija
h
Newr
e
n
t
6
022: New test checking
for unnecessary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
l
ija
h
Newren
t
6022
:
N
e
w t
e
st checking for un
n
ecessa
r
y updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
El
i
jah Ne
w
ren
Add
t
e
s
t
c
ases showing how
p
athspecs
a
re handled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elij
a
h Newre
n
Make rev-li
s
t --
o
bjects work tog
e
ther with path
s
p
e
cs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah
N
e
wren
In
t
roduce
s
ane_unset and use i
t
to ensure proper &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
t78
0
0 (di
f
ftool):
a
dd missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7601 (merge-pull-config):
add missin
g
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7
0
01 (mv)
:
add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah
N
ewren
t
6
016 (r
e
v
-
l
ist-grap
h
-s
i
mplify-hist
o
ry): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewr
e
n
t5602 (clone-re
m
ote-exec): ad
d
mi
s
sing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t
4
02
6
(col
o
r): remove unneeded and unchained com
m
and
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t4019 (diff
-
wserro
r
):
add lots of missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
t4202 (log
)
:
Replace '
<
git-command> ||
:' with tes
t
_mi
g
ht_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newr
e
n
t
4
00
2
(
d
iff-basi
c
): use test_mi
g
ht_fa
i
l for
commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t100[12] (read-tree-m-2way
,
rea
d
_tree_m_u_2
w
ay):
a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Newren
t4017 (diff-re
t
val
)
: rep
l
ace manu
a
l exit
code che
c
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
E
lijah
N
e
w
r
e
n
t
3
0
20 (ls-fil
e
s
-err
o
r-unmatch): remove stra
y
'1' f
r
om
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsi
v
e:
R
emove redundant path
cl
e
a
r
ing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newr
e
n
merge
-
recursive: Make room for directori
e
s in
D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
handle_delete_modif
y
(
)
:
Chec
k
whether D/F
conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
mer
g
e_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
Elijah N
e
wren
co
n
f
lict_rename_rename_1to2(): Fix checks fo
r
p
r
esence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
conf
l
ict_rename_delet
e
(): Che
c
k
w
hethe
r
D/F c
o
nfl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h
Newren
merg
e
-recursive: D
e
l
ay modify/delete conf
l
icts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
merg
e
-
r
e
c
ursive: Delay conte
n
t mergin
g
for rena
m
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
merge-r
e
c
ursive: D
e
lay handling of
rename/delet
e
conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
me
r
g
e
-recursive: Move handl
i
n
g
of double re
n
am
e
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
m
e
rge-recursive: Move han
d
ling o
f
do
u
ble r
e
na
m
e of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-recursive: Avoi
d
doubly merging r
e
nam
e
/add conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wre
n
m
e
rge-recursiv
e
: Upd
a
t
e merge_content() ca
l
l signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h Newren
me
r
ge-recursive
:
Updat
e
conflict_
r
ename_r
e
na
m
e_1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge-rec
u
rs
i
ve: St
r
ucture process
_
d
f_entry(
)
t
o
h
a
ndle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
mer
g
e-recursive: Have p
r
oces
s
_
e
nt
r
y()
s
kip D/F o
r
r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
a
h Newren
merge-recurs
i
ve: New function
t
o assis
t
r
e
s
olvin
g
ren
a
mes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wre
n
mer
g
e
-
recursive: New data structures for
deferr
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-recu
r
si
v
e: Move process_entry's content
m
e
rging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Move delete/mod
i
fy handlin
g
into dedicate
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next