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
test-lib: make "-x" work with "--verbose-log"
2017-11-15
El
i
jah N
e
wren
m
e
rg
e
-recursive: handle addition of s
u
bmodule o
n
our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah Newren
t6044: new
merge testcas
e
s fo
r
when
i
ndex do
e
sn't m
a
tch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
i
j
a
h
Newren
merge-oc
t
op
u
s:
a
bort
i
f in
d
ex
does no
t
match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
b
uiltin/merg
e
.
c
: fix a bug with triv
i
a
l merge
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
t7605: add a testcase demonstrating
a
b
ug with
trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
ewren
mer
g
e-recursive: do n
o
t
c
h
eck w
o
rking copy when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah
Newren
m
erg
e
-recurs
i
ve
:
remove
d
uplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
Newren
merge
-
recursive: Don't re-sort a list whose or
d
er we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
c
ursive: Fi
x
v
irtual merge base for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6036: criss-cros
s
+
rename/rename(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-recursive:
A
void
unnecessary file
r
ewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6022:
A
d
d
itional
t
ests checking for
u
nnecessary
u
pdates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recursive: Fix spurious
'
refusing to l
o
se u
n
t
r
a
cked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newren
t6022
:
Add t
e
s
tca
s
e for
spu
r
i
o
u
s
"refusing
t
o
los
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ew
r
en
merge-
r
ecursive:
Fix working copy handling fo
r
renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newren
me
r
g
e
-r
e
cursive: add
h
a
ndling for rename
/
r
e
name/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
Newr
e
n
merg
e
-rec
u
rsive: Have
c
o
nf
l
ict_re
n
a
me_
d
ele
t
e reus
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-r
e
c
u
rsive
:
Make
modify/delete ha
n
dling code reusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recursive: Consider mo
d
ificati
o
ns in
r
en
a
me/ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-re
c
ursi
v
e: Create fu
n
ction for merging
w
ith branchnam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
r
en
mer
g
e-recu
r
siv
e
: Record
more data nee
d
ed for
merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursive: D
e
fer rename/r
e
name(2to1)
han
d
l
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewre
n
mer
g
e-recursive:
Small cleanups for conflic
t
_rename_rename_1to
2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newre
n
merge-r
e
cursive:
F
ix rename/
r
ename(1to2
)
res
o
lutio
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive: Introduce a me
r
ge_f
i
le
c
o
n
v
enience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
New
r
en
merge-recursiv
e
: Fix m
o
dify/delete resolution i
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
merge-recursive: When we de
t
ect
w
e
can
s
kip
an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wre
n
me
r
ge-recursive: Provide
more info
in conflict markers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
Newren
mer
g
e-recursive: Cleanu
p
a
nd consolidation of
r
en
a
me_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah New
r
en
merge-re
c
ursive:
Consolida
t
e pr
o
cess_entr
y
() and process_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-re
c
ursive: Imp
r
ove ha
n
dling o
f
rename targ
e
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive
:
A
dd com
m
ents about handli
n
g r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merg
e
-recursi
v
e: Make dead co
d
e for
r
ename
/
re
n
ame(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Fix del
e
ti
o
n of untracked fi
l
e
in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-rec
u
rsive: Spl
i
t u
p
date_stages_and_
e
ntry; o
n
l
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recursi
v
e
:
Al
l
ow make_room_for_pa
t
h() to remove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ew
r
e
n
merge-recursive: Spli
t
was_tracked() o
u
t of would_lose_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-
recursive: Save
D/F confl
i
ct file
n
ame
s
instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
mer
g
e-recursiv
e
: Fi
x
code check
i
ng
for D/F c
o
nflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge
-
r
ecu
r
s
i
v
e: Fi
x
sorting order a
n
d
directory ch
a
nge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
merge-recu
r
sive: Fix
recursi
v
e ca
s
e with D/F confli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
me
r
g
e
-recursive: Avoid
w
or
k
in
g
di
r
e
ctory changes during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Ne
w
r
e
n
merge-recur
s
i
ve: Remember to
f
r
ee gener
a
t
e
d u
n
ique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recurs
i
ve: Consolidate diff
e
rent update_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge
-
recursive:
M
a
rk some dif
f
_filespe
c
struct
arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
mer
g
e-recursiv
e
:
Corr
e
c
t
a comme
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Ne
w
ren
merge-recursi
v
e: Make BUG
me
s
sage more legible b
y
ad
d
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
t6022: Add tes
t
c
ase for merging a re
n
ame
d
file w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022:
N
ew tes
t
s checking
for unnecessar
y
u
p
d
a
tes of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6022:
R
emove unn
e
cessary untr
a
cke
d
files to make test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
t6
0
36:
criss-cross
+ ren
a
me/rename(1to2)/add-sour
c
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
Newre
n
t6036:
c
riss-
c
ross w/ ren
a
me/renam
e
(
1
to2)/modify
+
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h N
e
wren
t60
3
6: tests
f
or
criss-
c
ros
s
merges
with var
i
ou
s
directo
r
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036
:
criss-cross wit
h
weird con
t
ent can fo
o
l g
i
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6036: Add differently res
o
lved mo
d
ify
/
delete
c
onflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewren
t6042: Add
f
ail
i
ng tes
t
cases
for
r
e
name/ren
a
m
e/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t604
2
: Ensure r
e
name/r
e
name conflicts leave index
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
Newren
t6042
:
Add
t
ests for content issues wit
h
m
o
dify/
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
t604
2
: Add a testcase
w
h
e
re undetected
re
n
a
me caus
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
4
2: Add a pair of
c
a
s
es w
h
ere undetected re
n
ames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6042: Add failing
tes
t
c
a
se fo
r
rename/modif
y
/add-
s
ourc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6042
:
Add a testcase w
h
er
e
git deletes an
untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Eli
j
ah Newren
merge-recursi
v
e: When we detect we can skip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elij
a
h Newren
t6022: New
test checking
f
or unnec
e
ssary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newre
n
t6022: New test ch
e
ckin
g
for
u
nnecessary upd
a
tes
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Ne
w
ren
Add testcases sho
w
ing how
p
a
thspecs are handled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Ne
w
ren
Make rev-list --objects work tog
e
ther wit
h
path
s
p
ecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
ren
Introduc
e
s
a
ne_un
s
et an
d
use it t
o
ensure pr
o
per &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah N
e
w
ren
t
7800 (difftool): add missi
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
e
w
ren
t7601
(merg
e
-
p
ull-con
f
ig): add missin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7001 (mv): add missi
n
g
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
ren
t6016
(
rev-list-graph-
s
implify-hi
s
tory):
add
m
issi
n
g
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t5602 (clone-
r
emote-exec): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h
Ne
w
r
e
n
t4026 (color)
:
remove
unneeded and unchain
e
d command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4019 (diff
-
wserr
o
r
)
: add lots of
m
issing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah New
r
en
t4202 (
l
og)
:
Replac
e
'<g
i
t-command> ||
:' wit
h
tes
t
_
m
ight_fai
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4002
(diff-basic): use test_m
i
ght_fa
i
l for commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah N
e
w
r
e
n
t100[12] (read-tree-m-
2
way, read_tr
e
e_
m
_u_2way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
4
0
17 (diff
-
retval): r
e
pl
a
ce manual exit c
o
de chec
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Eli
j
ah Newren
t
3
0
2
0 (
l
s-file
s
-er
r
or-un
m
atch): remove st
r
ay '
1
' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Newren
merge-recursive: Rem
o
ve
re
d
u
ndant
p
ath clearing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merge-recur
s
ive: M
a
ke
room for direct
o
ries in D
/
F confli
c
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
handle_dele
t
e_
m
odify(): Chec
k
whether D/F
c
onflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah N
e
wren
m
erge_c
o
ntent(): Check whether D/F co
n
fli
c
ts are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
co
n
f
lict_rena
m
e_rename_1to2(): Fix che
c
ks for pr
e
sence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah Ne
w
ren
conflict_ren
a
m
e
_delete()
:
C
h
eck
whe
t
h
e
r
D
/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newre
n
merge-recursive: D
e
lay modify/del
e
t
e
confl
i
cts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
mer
g
e-recursive: Delay content m
e
rging for ren
a
m
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ija
h
N
e
wre
n
merge-r
e
cursiv
e
:
Delay handlin
g
of
rename/
d
elete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
ah New
r
en
m
e
rge
-
recursiv
e
: Move handl
i
ng of double r
e
n
am
e
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
merge-r
e
c
u
rs
i
ve: Move handling of double
ren
a
me of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
merge-recur
s
ive: Avo
i
d
d
oubly merging r
e
name/add conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah New
r
en
m
erge-recursi
v
e: Upda
t
e
merge_cont
e
nt
(
) call si
g
n
ature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-re
c
u
rsive: Update
c
o
nflict_rename_r
e
name_1to
2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
e
w
ren
m
e
rg
e
-rec
u
rsive: Structur
e
p
r
ocess_d
f
_
e
ntry(
)
t
o handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
a
h
Newren
m
erge-re
c
ursive: H
a
ve process_en
t
ry() skip D/F
or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-r
e
cur
s
ive: New function t
o
assist resolving rena
m
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
m
e
rge-recu
r
sive: New data
s
tru
c
tures for defer
r
in
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
N
ewr
e
n
merge-recursive: M
o
v
e
process_entry's con
t
ent me
r
gi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
mer
g
e-rec
u
rsive:
Move delete
/
modif
y
hand
l
ing into dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next