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
Merge branch 'jn/reproducible-build'
2017-11-15
El
i
jah N
e
wren
merge-recursi
v
e
: handle
a
ddition of
s
ubmodule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah Newren
t
6
0
4
4: new merge testcases
f
or when index doesn
'
t match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
merge-octopus: abort if index does not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
bu
i
l
tin
/
merge
.
c: fix
a bug with trivial merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t760
5
: add a testcase
d
emonstr
a
t
ing
a
bug with
trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h
N
ewren
m
erge-recursive: do n
o
t chec
k
w
orking copy when
cre
a
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
merge-recur
s
ive: remove duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah N
e
wren
merge-r
e
c
u
rsive: D
o
n't re-
s
ort a
l
ist whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-re
c
u
r
sive: Fi
x
virtual
m
e
rge base for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
t603
6
:
criss-cross + ren
a
me/ren
a
me(1to2
)
/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
e
rge-recursive
:
Avo
i
d unnecessary f
i
le rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ew
r
en
t6022
:
A
dditional test
s
checking fo
r
u
n
necessary upd
a
tes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
merge-recursiv
e
: Fix spurious
'
ref
u
sing to lose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
en
t6022: Add testcase for sp
u
rio
u
s "re
f
using to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-
r
ecursive: Fix working copy ha
n
dling fo
r
r
ena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
m
e
rge-
r
ecursive: add handling for rename/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
mer
g
e-recu
r
sive: Have
c
onflict_ren
a
me_delete r
e
u
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
me
r
g
e-re
c
u
r
sive:
M
ake modify/de
l
ete handl
i
ng code r
e
usable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
erge-
r
ecursiv
e
:
C
onside
r
modif
i
cations i
n
rename/ren
a
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-re
c
ursive: C
r
e
a
te function for me
r
gi
n
g
w
i
th
br
a
n
c
h
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recursive: R
e
co
r
d mor
e
data
ne
e
ded
f
o
r m
e
rgi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
merge
-
recursive: Defer re
n
ame/rename(2to1) handlin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursive: Small cleanups for
conf
l
ict_rename_rename_
1
to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursi
v
e: Fix
r
ename/re
n
ame(1t
o
2) re
s
olution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newre
n
merge-recursive: Int
r
oduce a m
e
rge_file convenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah N
e
wren
merge-re
c
ursive:
F
ix mo
d
ify/de
l
ete resolution
in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: When we dete
c
t we can skip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecur
s
ive: P
r
ovi
d
e more info in conflict marker
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
N
e
wren
mer
g
e
-
recursive: Cleanup and consolidation
o
f r
e
name_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
e
rge-rec
u
r
s
ive:
C
o
nsolidat
e
process_entry()
and p
r
ocess_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recu
r
s
i
ve: Imp
r
ove handling of rename target
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
m
e
r
g
e
-
recursive: Add comments about handling rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
me
r
ge-
r
ecursiv
e
: Make dead code for rename/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
r
en
me
r
ge-rec
u
rsive: Fix dele
t
i
o
n of untracked file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-recursive: Sp
l
it update_stages
_
a
n
d
_
e
n
try;
o
nly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive:
Allow
m
ake_roo
m
_for_path() to remove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-
r
ecursive: Split was_tr
a
cked() out of woul
d
_l
o
se_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive: Save D/F con
f
lict filenames inst
e
ad
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge
-
recursive:
Fix c
o
de c
h
ecki
n
g
f
o
r D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: Fix sorting order and directory
c
han
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
r
e
cursive:
Fix recursi
v
e
c
ase with D/F conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Ne
w
ren
merge-recursive:
A
v
o
id work
i
ng directory cha
n
ges
d
ur
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
mer
g
e
-
re
c
urs
i
v
e
:
Re
m
ember to
f
ree generated
unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recu
r
siv
e
:
C
onsolidate diff
e
rent
u
p
d
ate_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursiv
e
: Mark some d
i
ff_filespec struct arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-re
c
u
r
sive: Cor
r
ect a co
m
m
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
me
r
ge-recursive: Ma
k
e BUG message
more legib
l
e by
a
dding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t
6
022: Ad
d
testcase for merging a rena
m
e
d
file with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6
0
22: New t
e
sts
checki
n
g for unnecessary update
s
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6
0
22: Remove unnecessary
u
n
tracked files
t
o make te
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
3
6
: criss-
c
ross
+ rename/rename(1to2)/add
-
sourc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
t6036: criss-c
r
oss w/ re
n
ame/rena
m
e(1to2)/mod
i
fy+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t603
6
: tests f
o
r cris
s
-cross
m
erges with various directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
t603
6
:
criss-c
r
o
ss with weird c
o
ntent can
fool
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
t
6
036: Add
d
i
fferently re
s
olved modify/delete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add failin
g
testcases
f
or rename/rename
/
a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ew
r
e
n
t6042: Ens
u
re
renam
e
/rename conflicts leave index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah N
e
wren
t604
2
: Add tests for c
o
ntent
iss
u
es
w
ith modify/ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
t6
0
42:
Add a
testcase wh
e
re undetecte
d
rename caus
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t
6
042: Add a p
a
ir
o
f
c
ases where undet
e
cted re
n
a
m
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t
6
042: Add
f
ail
i
ng testcase fo
r
ren
a
me/modify/a
d
d-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t
6
042
:
Add a
t
est
c
a
s
e
where git dele
t
es an
u
ntracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
El
i
jah Newren
mer
g
e-recursive: When we
detect we can skip an upda
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
t
6
022:
New test checking for unn
e
cessary upd
a
tes o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elij
a
h
Newren
t60
2
2: N
e
w test checking fo
r
unnecessary updates
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Add testcases sh
o
wing how
pathspecs
a
re h
a
ndled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah
N
ewren
M
ake
rev-list --o
b
jects work t
o
get
h
er
with pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
e
w
ren
Introduce sane_unset and use
i
t to ensure pr
o
per &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7800 (diff
t
o
o
l): ad
d
miss
i
ng &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newre
n
t760
1
(m
e
rge-p
u
ll-config): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
7001
(
m
v): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ija
h
Newren
t6016 (rev-
l
ist-graph-sim
p
lify-history): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t5602 (clone-remote-ex
e
c): add mi
s
sing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
ren
t402
6
(co
l
or): re
m
ove unnee
d
ed and unchained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4019 (diff
-
ws
e
rro
r
): add lots
o
f
mis
s
ing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t4202 (log)
:
Rep
l
ace '<
g
i
t
-command> ||
:' with
test
_
migh
t
_
fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah
N
ewren
t4002 (d
i
ff-basic): use test_might_fail for
commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t10
0
[1
2
] (read-tree-m-2w
a
y, read_tree_
m
_
u_2way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
t401
7
(diff-retval): r
e
place manual exit code
c
hec
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah
N
ewren
t30
2
0 (ls-fil
e
s-error-unm
a
tch):
r
emov
e
stray '1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Newre
n
merge-recursive: Re
m
ove redundant pa
t
h clearing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
N
ewren
merge-recur
s
ive: Ma
k
e
r
oo
m
for d
i
re
c
t
ories in D/
F
co
n
flicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
handle_d
e
lete_modify(): Check w
h
ether D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge_
c
ontent(): C
h
eck
w
het
h
er D/F conf
l
icts are st
i
ll
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
wren
conf
l
i
ct_rename_rename_1to2()
:
Fi
x
checks for pr
e
s
e
n
ce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
ja
h
Newren
c
o
nflict_ren
a
me_delete(): Check wh
e
ther D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-re
c
ursive: Delay
m
odify/delete conflic
t
s if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
Newre
n
mer
g
e-
r
ecur
s
ive: De
l
ay content mergi
n
g for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recu
r
s
i
ve: Delay handling
o
f rename/delete
confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
N
ewren
mer
g
e-recursiv
e
: Mov
e
handling of doub
l
e re
n
ame of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Newre
n
merge-recursive: Mov
e
handli
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: Avoid doubly
merging rename/add co
n
flict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newre
n
m
e
rge-
r
ecur
s
ive: U
p
da
t
e me
r
ge_
c
ontent() call sig
n
at
u
re
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
N
ewren
me
r
ge-r
e
cu
r
s
ive: U
p
date c
o
nflict_rename_rename_1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
merge-recursive:
S
t
ructure proce
s
s_df_
e
nt
r
y() to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
merge
-
recursive: Have process_
e
ntry
(
) skip D/F or r
e
nam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: New funct
i
on to assist
r
esolving renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursiv
e
: New data st
r
uctures fo
r
d
efe
r
ring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
mer
g
e-recursive: Mov
e
proces
s
_entry's content mer
g
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merg
e
-recursive: M
o
v
e
delete/m
o
dify ha
n
dling into ded
i
ca
t
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next