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-recursive: introduce new functions to handle rename logic
2018-04-20
Elijah Newren
me
r
ge
-
recursiv
e
: introd
u
ce new functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
mer
g
e-recu
r
sive: move th
e
get_renames(
)
fun
c
tion
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
re
n
directory
r
ename detection: tests for hand
l
ing
o
verw
r
it
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah N
e
w
ren
directory
rename detecti
o
n
:
t
e
s
t
s for handli
n
g
o
v
e
r
w
rit
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
New
r
en
directory r
e
name det
e
ction: miscella
n
eous testcase
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h N
e
wren
di
r
e
ctory ren
a
me detection: testcases ex
p
loring po
s
sibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah Newren
d
i
rectory rename d
e
tection: more involved edge/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
ah Newren
dire
c
tory rename
de
t
ecti
o
n: testcas
e
s check
i
ng
w
h
i
ch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
direc
t
o
r
y
rename detection: files/
d
irectories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lijah N
e
wren
d
i
re
c
t
o
ry
r
e
name detection: partially r
e
name
d
direc
t
ory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Ne
w
r
en
directory
rename det
e
ction: testcase
s
t
o
a
void taking
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newren
d
i
re
c
tor
y
re
n
ame detection: directory
s
p
l
itt
i
ng testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
d
i
rectory rename detec
t
ion:
bas
i
c te
s
t
cases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
merge-recursi
v
e: ensu
r
e we w
r
ite
updates for dire
c
tory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
merge-recursiv
e
:
a
v
oid
s
purious rename/rename conf
l
ic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
lijah Ne
w
r
e
n
directory rename detection: new testcases showcasing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wren
merge-recur
s
ive: fix re
m
aining directory rena
m
e + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah N
e
wre
n
merge-recursive: fix over
w
r
iting dirty fil
e
s
i
n
volved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
me
r
ge-r
e
cursive
:
avoid clobberin
g
untr
a
cked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
N
ewren
merge-recu
r
sive: apply
n
ecessary modifi
c
a
t
ions
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
m
e
rge-recurs
i
ve: wh
e
n
comparing f
i
les, don
'
t
inc
l
ude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
merge
-
r
e
c
u
rsi
v
e: chec
k
for file level con
f
l
icts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
jah Newren
me
r
g
e
-
recursive: add com
p
utat
i
on of collis
i
ons due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-r
e
c
u
rsive: check fo
r
d
irectory level conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
me
r
ge-recursive: add ge
t
_directory_re
n
ames(
)
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
jah
N
e
wren
merge-recur
s
i
ve: make a helper functio
n
for cle
a
nup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-recursi
v
e: spl
i
t
o
ut c
o
de for de
t
ermini
n
g diff_
f
il
e
pairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
j
ah New
r
en
me
r
ge-recursive: make !o->det
e
c
t
_
r
e
name codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ij
a
h Newren
merge
-
recur
s
ive:
f
ix leaks of al
l
ocated re
n
a
mes a
n
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
a
h Newren
m
e
rge-recursi
v
e: introduce new functions to han
d
le
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-
r
e
c
ursive: mo
v
e the get_
r
enames() functio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
dire
c
t
o
ry rename det
e
c
tio
n
: te
s
t
s for handling ov
e
rwr
i
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
direc
t
ory rename detection:
tests
f
or ha
n
dl
i
ng
overw
r
iting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dir
e
cto
r
y rename detect
i
on: miscella
n
e
o
us testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
dire
c
tory re
n
ame detec
t
i
o
n
:
t
e
s
t
cas
e
s
e
x
ploring
p
ossibly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
directory rename detection: mo
r
e invol
v
ed ed
g
e/corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newr
e
n
di
r
e
ctory rename
d
etecti
o
n: testcases
checking which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ew
r
en
dire
c
tory renam
e
de
t
e
c
t
ion
:
fil
e
s/d
i
rectories
in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
r
e
n
direc
t
ory rename dete
c
tion: parti
a
lly renamed directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
i
rectory rename detecti
o
n: t
e
st
c
ases to avoid tak
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
directory rename de
t
e
c
tion: di
r
ectory
s
plittin
g
testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
di
r
ectory ren
a
me de
t
e
c
t
i
on: basic testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
m
erge-recursive: add expl
a
nation fo
r
src_ent
r
y
a
nd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursi
v
e: fix logic order
i
n
g
issue
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
Ti
g
hten
a
nd correct a
f
e
w
t
estca
s
es for mergi
n
g and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
lijah Ne
w
r
en
me
r
ge-recurs
i
ve: avoid incorporati
n
g
unco
m
m
i
t
ted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elij
a
h Newren
move index_
h
a
s_changes() from builtin/am
.
c
to
m
erge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elij
a
h Newr
e
n
t6044: recursi
v
e ca
n
sil
e
ntly incorp
o
r
a
t
e d
i
rty
changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Eli
j
ah
N
ewren
st
r
bu
f
: remove unused stripsp
a
ce functio
n
alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newren
me
r
ge
-
recursi
v
e: ignore_ca
s
e shoul
d
n't r
e
ject intent
i
o
n
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
El
i
jah Newren
sequencer:
show rename pr
o
gress duri
n
g
cherry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah N
e
wr
e
n
diff:
remove
silent clamp of renam
e
Limit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
N
ewren
progress:
fix progress
meters wh
e
n
de
a
ling with lo
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newre
n
merge
-
recursive:
h
andl
e
addition of
submodule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Eli
j
ah Ne
w
ren
sequencer: w
a
rn when in
t
er
n
al merge
m
a
y
b
e subop
t
im
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t6044: new merge testcases f
o
r when
in
d
ex doesn't
m
atch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
m
e
rge-octopu
s
: abo
r
t if index
d
oes not ma
t
c
h
HEA
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
wren
built
i
n/merg
e
.
c
:
fix a bu
g
with trivial merg
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newr
e
n
t
7
6
0
5: add a
t
e
stcase demo
n
str
a
ting a b
u
g
w
i
th trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
a
h
Ne
w
ren
merg
e
-recu
r
s
i
ve: do n
o
t check
wo
r
king co
p
y when c
r
e
a
ting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
mer
g
e-recurs
i
ve: remove du
p
lic
a
te
c
ode
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
re
c
ursive: Don't re-s
o
rt a
list whose ord
e
r
we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge
-
recursive: Fix virtual merge base fo
r
rena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
en
t60
3
6: cris
s
-c
r
oss + rena
m
e/re
n
a
m
e(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-r
e
c
ursiv
e
:
Avoid
u
nnecessary file rewr
i
tes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t
6
022: Additional tests
c
hecking for
u
nnecessary upda
t
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Newren
merge-re
c
ursive: Fix spu
r
i
ou
s
'r
e
fusing to lose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
022:
A
dd testca
s
e for
spur
i
ous "refusing to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewr
e
n
merge-recur
s
i
ve: Fix
w
orking copy h
a
n
dling f
o
r rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recu
r
sive: add handling for rename/r
e
name/ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
merge-recursive: Have conflict_rename_delete reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-r
e
cursive: Make modify/delete hand
l
ing
c
ode reusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newr
e
n
merge-recursive: Consider modific
a
t
ions in r
e
name/re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-rec
u
rsive: Create fun
c
t
ion for mergin
g
w
i
th b
r
anchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
ren
merge-rec
u
r
s
ive
:
Rec
o
rd more data ne
e
ded for m
e
rging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
D
efer r
e
name/rename(2to1) ha
n
d
l
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
merge-recur
s
iv
e
:
S
m
a
ll cleanups for
conflict_rename_ren
a
me
_
1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newre
n
merge-recurs
i
ve:
F
i
x
rename/rename
(
1to2) resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursive: Introduce
a merg
e
_fil
e
convenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
e
r
g
e-recurs
i
ve: Fi
x
modify/de
l
ete
resolution in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: When we
detect we can skip an
update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-recursive: Provi
d
e more
in
f
o in co
n
flict markers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recursive: Clean
u
p
and consolidatio
n
of
r
en
a
me_con
f
lic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
me
r
ge-recursive: Consolidate
p
rocess_entry() and
process_
d
f_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah N
e
w
r
en
merge-
r
ecursive: I
m
pro
v
e handling of rename
t
arget
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newr
e
n
me
r
ge-
r
ecursive: Add
comments ab
o
u
t handlin
g
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
merge-recursive: M
a
ke
dead code f
o
r
rename/ren
a
me(2
t
o1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
N
ewren
me
r
g
e-recursive: Fix dele
t
i
o
n
of untracked
f
ile in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
ewren
m
erge-recursiv
e
: Spl
i
t update_stag
e
s_and_
e
ntry; o
n
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recurs
i
v
e
: Allow make
_
room_for_path() to
r
e
m
ove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
mer
g
e-rec
u
rsive: S
p
lit wa
s
_tr
a
cked() out o
f
would_l
o
s
e_untr
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursiv
e
:
Save D/F conflict f
i
lenames instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h New
r
en
merge-r
e
c
ursi
v
e:
F
ix code ch
e
cking for D
/
F con
f
licts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recur
s
i
v
e: Fix sortin
g
order and dire
c
t
o
ry ch
a
nge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h
Newren
merge
-
r
ecursive:
Fix recursive
c
ase with D/F confl
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
ewren
m
e
rge-recursive:
Avoid working
d
i
r
e
c
tory changes du
r
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-r
e
curs
i
v
e: Remember to free generated uniqu
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
m
erge-r
e
cursive:
Cons
o
lidate different update_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
m
e
rge-
r
ecursive: Ma
r
k some diff
_
filespec stru
c
t arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
m
e
rge-rec
u
rsi
v
e: Correct
a c
o
mme
n
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next