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: check for directory level conflicts
2018-05-08
Elija
h
N
e
wren
mer
g
e-recursive: ch
e
ck for dire
c
tory level conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: ad
d
get_directory_renam
e
s(
)
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
i
jah Newren
m
e
rge-recurs
i
ve: make
a
helper function for cleanup
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
merge
-
r
e
curs
i
v
e
:
split out c
o
de
f
or determ
i
ning diff_filepairs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newr
e
n
merge
-
recursive:
ma
k
e !o->de
t
ect_rename codepath more
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
me
r
ge-recursi
v
e:
f
ix leaks o
f
allocated
renames and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
m
e
rge-recursive: introduce new functions to handle
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
me
r
ge-r
e
c
ursive: move th
e
get_
r
ena
m
es() func
t
ion
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newre
n
d
i
re
c
tory rename detection
:
te
s
t
s for handling overwr
i
ting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Ne
w
ren
directory re
n
ame detecti
o
n: tests for h
a
ndl
i
ng
overwriting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newren
directory rename detection: mi
s
c
e
llaneo
u
s t
e
stc
a
s
es
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah N
e
wre
n
dire
c
t
o
ry rename detection: testca
s
es exploring possibly
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
di
r
e
cto
r
y
r
ename detect
i
on:
more i
n
vo
l
v
ed e
d
g
e/c
o
r
ner
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename detec
t
ion: test
c
ases checking
w
hich
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
d
i
r
ectory rename detection: file
s
/directories in the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
li
j
ah Newren
direct
o
ry rename d
e
tection
:
p
a
rtially renamed directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
El
i
j
ah New
r
en
dire
c
tory rename dete
c
tion: testca
s
es
to avoi
d
taking
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directo
r
y rename detecti
o
n: dire
c
tory splitt
i
ng t
e
stcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Ne
w
ren
dir
e
ctory rena
m
e det
e
ction: ba
s
ic
testcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
New
r
en
merge-rec
u
rsi
v
e: en
s
ure we write updat
e
s for direc
t
ory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
El
i
jah Newren
merge-re
c
ursive: avoid spurious rename/
r
ename conflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newren
d
ir
e
ctory rename detection: new testcases sh
o
wcasing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
E
l
i
ja
h
Newren
me
r
g
e
-re
c
ursive: fix re
m
aini
n
g d
i
rectory re
n
a
me + dirty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-recu
r
sive: fix overwri
t
i
n
g dirty file
s
invo
l
ved
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merge-r
e
cursiv
e
:
a
void clobbering untr
a
cked files with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Newren
m
e
rge-recurs
i
v
e
: ap
p
l
y necessary modifications fo
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-rec
u
rsiv
e
:
w
hen comparing files, don't in
c
lude
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Newren
merg
e
-recurs
i
v
e
: che
c
k
for file level confl
i
c
t
s t
h
e
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah
Newren
m
e
rge-recu
r
si
v
e: add
c
omputation
of collis
i
ons due
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah New
r
en
merge-recursive: chec
k
for d
i
re
c
tory level conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
me
r
ge-recursive
:
add get_dire
c
tory_renames()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merg
e
-
recurs
i
ve: make a helper
f
u
n
c
t
io
n
for clean
u
p
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah N
e
wren
merge-recur
s
ive
:
sp
l
it out code
f
o
r
determin
i
ng diff_filepairs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
merge-recursive: ma
k
e !o->detect_rename codepath mo
r
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Ne
w
ren
merge-recursive: fix leaks
of al
l
ocated renames an
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
mer
g
e
-
recursive
:
i
n
t
r
o
duce ne
w
functions
t
o
handle
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newr
e
n
mer
g
e-recursive: m
o
ve the get_renames()
functi
o
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
Newren
dire
c
tory
rename detection:
tests for hand
l
ing overwr
i
ting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
direct
o
r
y
r
e
n
a
m
e d
e
t
ection: tests for ha
n
d
ling o
v
erwriti
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah N
e
wren
directory rena
m
e detection: mis
c
e
l
l
aneous testca
s
es
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
lija
h
Newren
direc
t
ory r
e
name detectio
n
: testcases exploring po
s
s
i
bly
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
directory
r
ena
m
e detection
:
mor
e
invol
v
ed edge/corner
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
d
ir
e
ct
o
ry re
n
a
me detection: te
s
tcase
s
checking whi
c
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newre
n
d
i
r
e
ct
o
ry r
e
n
a
me detectio
n
:
fi
l
es/direc
t
orie
s
in the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
Newren
directory r
e
name de
t
ectio
n
: partia
l
ly renamed directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah Newren
di
r
ector
y
renam
e
d
etectio
n
: testcases to
avoid ta
k
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
dir
e
ctory rename detection
:
directory splitting t
e
stca
s
es
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
direct
o
ry rename detec
t
io
n
: basic testcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
merge-recursive: add explanati
o
n for src_e
n
try an
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
El
i
jah Newren
merge-recur
s
ive: fix logic ordering issue
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newren
Ti
g
hten and correct a few testcases
f
or mergi
n
g
an
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newre
n
merge-recursive: avoid incorporating unco
m
mitte
d
change
s
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elija
h
Ne
w
ren
move index_has_ch
a
nges() from builtin/
a
m
.
c to m
e
r
ge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t6044: re
c
u
r
sive can silently incorporate dirty
changes
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-05
Elija
h
N
ewre
n
str
b
uf: remove un
u
s
ed stripspac
e
f
u
nction alias
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
E
li
j
ah New
r
en
me
r
ge-r
e
cu
r
sive
:
ignore_case
shouldn't reject intentional
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Elij
a
h Newre
n
sequencer: show rename progress duri
n
g cherry pi
c
ks
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Newren
diff:
r
emove si
l
ent clamp
o
f ren
a
meLimit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Ne
w
ren
progress: fix
p
rogre
s
s
m
et
e
rs w
h
en dea
l
i
n
g
with lots
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
a
h
Newren
mer
g
e-recursive: han
d
le addition of sub
m
odul
e
on our
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
se
q
uencer: war
n
w
hen internal merge may be suboptimal
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t
6044: n
e
w merge
t
est
c
ases for when inde
x
doesn't
m
atch
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
Newren
merge-octopu
s
:
abort if index
d
o
e
s not
match HEAD
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah Newre
n
bu
i
ltin/merge
.
c: fix a bug with
trivial merges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
t7
6
05: add
a testcase demonstrating a bug
with triv
i
al
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newr
e
n
merge-recursive: do not check wo
r
king copy when cre
a
ting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
ah Newren
merge-rec
u
r
s
ive: r
e
move du
p
lica
t
e c
o
de
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
Don
'
t
r
e
-sor
t
a lis
t
whose order we
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
merge-recursive: Fi
x
virtu
a
l
m
erge base
for
r
e
n
ame
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t
6036: criss-cros
s
+ rename/r
e
name(1to
2
)/add-d
e
st
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Ne
w
ren
merge-recu
r
sive:
Avoid unn
e
c
essar
y
file rewr
i
tes
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
e
w
ren
t6022:
A
dditional tests checking
fo
r
unne
c
essary updates
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
ren
me
r
g
e
-recursive: Fix spurious '
r
efusing
t
o lose untr
a
cked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t
6
02
2
: A
d
d testcase for spurious "refus
i
ng to lose
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursive: Fix
working copy hand
l
ing for rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursive: add handling
for rename/r
e
name
/
add
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-rec
u
rsive: Ha
v
e conf
l
ic
t
_re
n
a
me
_
d
elete
r
euse
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
me
r
ge
-
r
e
cursive
:
Ma
k
e modify/delete
handling cod
e
reusabl
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
me
r
ge
-
recu
r
sive: Consider modi
f
icatio
n
s in rename/re
n
ame
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
Newren
merge-recursive: Create func
t
ion for
m
er
g
i
ng
w
ith branchnam
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
m
erge-
r
ecur
s
i
v
e: Record more data needed for mergi
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
mer
g
e-recur
s
ive: Defer rename/re
n
am
e
(
2
to1) handli
n
g
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
w
ren
merge-rec
u
rs
i
ve
:
Sma
l
l
cl
e
anup
s
for
c
onflict_rename_rename_1to2
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-recursive: Fix re
n
am
e
/rename(1to2) resolutio
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah New
r
en
merge-recursive: In
t
rod
u
ce a m
e
rge_file c
o
nvenience
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive: Fix modify
/
delete resolu
t
ion in the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
N
ew
r
en
me
r
ge-recursive
:
When we detect we can s
k
ip an update
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-rec
u
rsive: Prov
i
de more info in conflic
t
m
a
rkers
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
me
r
ge-recursive: Cle
a
nup and consolidation o
f
rename_c
o
nfl
i
c
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
e
rge-recursive: Consolidate
p
roce
s
s_entry() a
n
d process_
d
f_
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recurs
i
ve
:
Improve handling
o
f
rena
m
e ta
r
get
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah New
r
en
merge-recu
r
sive: A
d
d comments
about
handling re
n
ame
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recurs
i
v
e
: Make d
e
ad
c
ode for r
e
n
a
me/rena
m
e(2
t
o1
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Ne
w
ren
mer
g
e-recursive: Fix d
e
le
t
ion of
u
n
tracked f
i
le
i
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive
:
S
p
lit upd
a
te_stages_and_e
n
try; only
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recursi
v
e: Allow ma
k
e
_room
_
for_pa
t
h() to remove
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h Newren
me
r
ge-recur
s
ive: S
p
lit was
_
tra
c
ked() out of
w
oul
d
_lose_unt
r
a
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
merge-recursive: Sa
v
e D/F conflict
f
ilename
s
instead
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newr
e
n
merg
e
-recursive: F
i
x code checking for D/F conflicts
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
merge-re
c
ursive: Fi
x
s
o
rting order and direct
o
ry
change
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next