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
strbuf: remove unused stripspace function alias
2017-12-05
Elijah N
e
wren
strbuf: remove unused stripspace function alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newr
e
n
m
e
rge-
r
ecursive: handle
a
ddit
i
on of submodule on o
u
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h New
r
en
t6044
:
new merge testcases for wh
e
n index doesn'
t
mat
c
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah
Newren
merge-
o
ctopus: abort if inde
x
doe
s
not
match HEA
D
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h Newren
b
u
iltin/
m
erge
.
c:
f
i
x a bug with trivial
m
erges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Eli
j
a
h
Newr
e
n
t7605: add a test
c
ase demonstrating
a
bu
g
with
t
r
i
vial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newr
e
n
merge
-
recu
r
s
i
ve: do not check working copy
w
h
en creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah
N
e
wren
merg
e
-recur
s
ive: rem
o
v
e
du
p
licate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recursive: Don't re-sort a list who
s
e o
r
d
er we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-re
c
ursive: Fix v
i
rtual
m
erge
b
ase f
o
r rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6036:
c
r
i
ss-cross +
r
e
name/rename(1to2)/add-
d
es
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
erge-recursive: Avoid unne
c
essary file re
w
r
i
tes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
2
2: Add
i
t
ion
a
l
tests checking fo
r
unnecessary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursiv
e
: Fi
x
spurious 'refusing t
o
lose u
n
tra
c
ked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
ren
t602
2
: Add t
e
stcas
e
fo
r
s
pu
r
ious "re
f
using to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recursive:
Fix
working copy han
d
ling for re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Ne
w
r
en
merge-recursive: add hand
l
ing f
o
r ren
a
me/re
n
a
me/
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
g
e
-recursive: Have
c
onflict_r
e
name_d
e
lete reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge
-
re
c
u
rsive: Mak
e
modify/delete handling code re
u
sable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
e
w
r
e
n
merge-r
e
cursive: Consid
e
r modifica
t
ions in rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
ive: Create f
u
nction for merging with branchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge
-
r
e
cursive: Record more dat
a
need
e
d
for merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-
r
e
curs
i
ve: Defer rename/
r
ename(2to1)
h
a
ndling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recu
r
sive: Small cle
a
nups f
o
r confli
c
t_ren
a
me_rename_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursive:
Fi
x
rename
/
rename(
1
to2)
r
esol
u
t
i
on
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
merge-
r
ecursive
:
Introduce a m
e
rge_file co
n
venience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
ja
h
N
e
wren
merge-rec
u
r
sive: Fix
m
odi
f
y
/
delete
reso
l
ution in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-r
e
cu
r
s
i
ve: When we
de
t
ect we can
s
kip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
me
r
g
e
-recursive: Provide m
o
re info in conflict m
a
rker
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Ne
w
ren
m
erge-r
e
cursi
v
e: Cle
a
nu
p
and consolidat
i
o
n
of rena
m
e
_
co
n
flic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursive:
Con
s
o
l
idate
p
r
ocess
_
entry() and
p
rocess_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recursive: Improve ha
n
dling of re
n
ame
t
arget
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-rec
u
rsive: Add
comments about handling re
n
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursive:
Make dead code
f
or rename
/
rename(2
t
o
1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
e
wr
e
n
merge-re
c
u
r
s
i
ve: Fix
d
e
leti
o
n of
u
ntrack
e
d file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
New
r
e
n
m
e
rg
e
-recursive: Split
update_stages_and_entry; o
n
ly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge
-
recur
s
ive: Allow
make
_
room
_
for_path()
t
o
r
e
move
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recurs
i
ve: S
p
lit was_t
r
a
cked()
o
ut of
w
ould_l
o
s
e_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
mer
g
e-recursive: Save D/F conflict
filenames instea
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
wre
n
m
e
r
ge-
r
e
cursive: Fix code checking for D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursive:
F
i
x sorting o
r
de
r
and dir
e
c
tor
y
ch
a
nge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
a
h Newren
merge-recursi
v
e: Fix r
e
cursi
v
e case with
D
/F conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h Newren
merge-recursive: Avoid working directory ch
a
ng
e
s during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
merge-re
c
urs
i
ve:
Re
m
ember
t
o fr
e
e generated
unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Newren
merge-
r
ecursive: Consol
i
date d
i
fferen
t
u
pdate_s
t
ages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h Newren
merge-recursive
:
Mark some diff_fil
e
spec struc
t
argum
e
nts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
N
e
w
ren
m
e
rge-recursive
:
Cor
r
ect a comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Ne
w
r
en
merge-recursive:
Make BUG
m
e
ssag
e
more legible by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t602
2
: Add
t
estcase
for merging a re
n
amed file with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
Newren
t6
0
2
2
: Ne
w
t
e
sts chec
k
in
g
for u
n
necess
a
ry updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6022: Remove
un
n
ecess
a
ry untra
c
ked files
t
o m
a
ke
t
e
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
t6036
:
cris
s
-cr
o
s
s
+ rename/rename(1to2)/add-s
o
ur
c
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
0
3
6
:
c
ris
s
-cross w/ rename/
r
ename
(
1to2)/
m
odify+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
t
6
036: tes
t
s for criss-cr
o
s
s me
r
ges with various directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
t6036: criss-cross with
weir
d
content can fool git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6036: Add dif
f
eren
t
ly re
s
olved modify/delete conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6042: Add failing testcases for rename/r
e
name/ad
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: E
n
sure rename/rename con
f
licts
l
eave inde
x
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Ne
w
ren
t6042: Add
t
ests for co
n
tent issues with mo
d
ify/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6
0
42: Add a tes
t
case where undetected
r
ename causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6042: Add a
pa
i
r of cases w
h
ere undet
e
cted rena
m
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042:
A
dd faili
n
g testcase for rename
/
m
odify/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
t6042: Add a
testcase
w
h
e
re
git de
l
etes an un
t
racked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah
Ne
w
ren
m
e
rge-rec
u
rsive: When we detect
w
e ca
n
skip a
n
update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
l
ijah
N
e
w
r
en
t6022:
New te
s
t check
i
ng f
o
r unnecessary updat
e
s of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah N
e
wren
t6022: New
test
c
h
ecking
for
u
nne
c
essa
r
y
u
p
dates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elij
a
h N
e
w
re
n
Add
t
e
s
tcases
s
howing how pathspecs are han
d
led wit
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newre
n
Make rev-list --obj
e
c
t
s work togeth
e
r with pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
Int
r
o
d
uce san
e
_
unset and use it
t
o
ensure pro
p
er &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewr
e
n
t7800 (d
i
fftool): add missing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t7601
(
merge
-
pull-config)
:
add m
i
ssing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t700
1
(
m
v): add mis
s
ing &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
t6016 (rev-list-
g
raph-s
i
mp
l
ify-
h
is
t
ory): add mi
s
sing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
5
602 (clone-r
e
m
ote-e
x
ec):
a
dd missi
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Ne
w
ren
t4026
(
co
l
or):
re
m
ove unneeded and unch
a
ined command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4
0
19
(
diff-wserror): a
d
d lots of missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4202
(l
o
g): Rep
l
ace '<git-command> ||
:
' with test_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah New
r
en
t
4
00
2
(diff
-
basi
c
): use
t
e
s
t
_might_f
a
il
for commands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h N
e
wren
t100[1
2
] (rea
d
-tree
-
m-2way, read_tree_m_u_2way):
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
w
r
e
n
t4017 (
d
if
f
-re
t
val)
:
repl
a
ce manual
e
xit code ch
e
ck
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newr
e
n
t302
0
(ls-files-error-unmatch): remove stray '1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
Newren
merge-recursive: Remov
e
redundant path c
l
e
a
r
ing f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rge-recursi
v
e: Ma
k
e room for directori
e
s in D/F c
o
nflic
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
e
n
han
d
le
_
delete_m
o
dify(): Check whether D/F confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
j
ah Ne
w
r
en
merge_c
o
n
t
ent(): Check
whether D/F confl
i
c
t
s are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
conflict_rename_
r
ename_1to2(): F
i
x ch
e
cks for presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
conflict_
r
en
a
me_delete()
:
Chec
k
w
h
e
ther D/F
c
o
nflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
me
r
ge-recu
r
sive: De
l
ay modi
f
y/de
l
ete
conf
l
icts if
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
Newren
merge-r
e
cursive: Delay
c
o
ntent merging
f
or renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
me
r
ge-recursive: Delay handli
n
g of rename/delete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-rec
u
rsive: Mov
e
h
a
n
dling of double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
me
r
ge-rec
u
r
s
ive: Move handli
n
g o
f
double r
e
name o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
mer
g
e-
r
ecurs
i
ve: Avoid doubly
merging rename/add conf
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
ewren
mer
g
e-recursive: Update
m
erge_conten
t
() call signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
merge-recurs
i
v
e:
U
pdate co
n
f
lict_
r
enam
e
_re
n
a
m
e_1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-re
c
ursive: Structur
e
proces
s
_d
f
_entr
y
() to hand
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Ne
w
ren
merge-recursive: Ha
v
e process_entry() skip D/F or renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
w
ren
mer
g
e-recurs
i
ve: N
e
w function
t
o
a
s
s
i
st
r
esolving renam
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive:
New data structures for deferrin
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-recursive: Move process_
e
n
t
ry's content me
r
g
in
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next