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
move index_has_changes() from builtin/am.c to merge.c for reuse
2017-12-22
Elija
h
N
e
wren
move
i
n
d
ex_h
a
s
_
chang
e
s()
fr
o
m builti
n
/
a
m
.
c
t
o me
r
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newre
n
t6044: recursive c
a
n sil
e
ntly incorporate
dirty change
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
a
h
Newren
merge
-
recursive: ha
n
dle addit
i
o
n
of
s
ubmo
d
u
l
e on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h Newren
t60
4
4
:
new merge te
s
tcases for when in
d
ex doesn't m
a
tch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-
o
c
topus:
a
bort if index does not
m
atch HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
e
wren
built
i
n/merge
.
c: fi
x
a bug with
t
rivia
l
merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t7605: a
d
d a testca
s
e demonstrating a bug with
t
rivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newr
e
n
m
e
rge-recursive:
d
o not check wor
k
ing
c
op
y
when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
merge-
r
ecur
s
ive: remove duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge
-
r
e
c
u
rsive: Don't re-sort a list
w
hose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-rec
u
rsive: Fix virtual merge base for re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: cr
i
ss-cross +
rename/rename(1to2)/add
-
des
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
m
erge-re
c
ursive: A
v
oid unnecessa
r
y fi
l
e
rewr
i
tes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t
6
022: Additi
o
nal
tests check
i
ng for unnecessary up
d
a
t
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Fix spu
r
i
ous
'
refu
s
ing to
lose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6022
:
Ad
d
t
estcase for spurious "
r
efusi
n
g to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merg
e
-recurs
i
ve:
Fix workin
g
copy h
a
ndling
for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newr
e
n
merge-recursive: add handling fo
r
rename/rename
/
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-
r
ec
u
r
sive:
Hav
e
conf
l
ict_rename_delet
e
reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merg
e
-recursiv
e
: Make modify/d
e
l
ete handling
code
reusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recursiv
e
:
Consider m
o
difications in ren
a
me/renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-
r
ecursive: Create fun
c
tion for mergin
g
with branchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recu
r
sive
:
Record more data n
e
e
ded f
o
r merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive: Def
e
r
ren
a
me/renam
e
(2t
o
1) handling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: S
m
all clean
u
ps for co
n
flict_rename
_
rename_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
merg
e
-
recursiv
e
: Fix rename/r
e
na
m
e(1to
2
)
resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursi
v
e:
I
n
t
roduce a merge_
f
ile con
v
enien
c
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newr
e
n
merge-recursive: Fix modify/delete reso
l
ution i
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newre
n
m
e
rge
-
recursive: When we detect
we
c
an
s
kip an up
d
ate
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newr
e
n
merge-recursive: Prov
i
de more info
i
n con
f
lict mark
e
r
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive: Cleanup
and cons
o
li
d
ation of r
e
name_c
o
nflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newr
e
n
merge-recursive: Cons
o
lidate process_e
n
t
r
y() and process_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recur
s
ive: Im
p
rove h
a
n
d
l
ing of r
e
n
ame target
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursive: Add comment
s
about
h
a
ndling rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive:
Make dead
c
ode for r
e
name/rename(
2
to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge
-
recursive
:
F
ix de
l
etion of
untr
a
ck
e
d file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Ne
w
r
en
merge-
r
ecursive: Split upd
a
t
e
_stages_and_entr
y
;
only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
er
g
e-rec
u
rsi
v
e
:
Allow
m
ake_room_for_path() to
r
e
m
ove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cur
s
ive:
S
plit
w
as_tracked() out of would_lose_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wre
n
merge-recursive: Save
D
/F co
n
flict
filen
a
m
e
s instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
mer
g
e-recur
s
i
v
e
: Fix code
che
c
king for D/F
c
onflic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-rec
u
rsive:
F
ix sorting order
and directory chang
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-
r
ecursive: Fix recursiv
e
case
w
ith D/F conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
m
e
rg
e
-rec
u
rs
i
ve: Av
o
id workin
g
directory
changes
during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
New
r
e
n
merge-recursive: Remember
t
o free
g
en
e
ra
t
e
d uni
q
u
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewre
n
me
r
g
e
-recursive: Co
n
s
o
lidate differ
e
nt u
p
d
ate_s
t
ages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive: Mark
s
ome di
f
f_fil
e
spec struct arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge
-
r
ec
u
rsi
v
e
: Correct a com
m
en
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wre
n
m
erge-recur
s
i
ve: Make B
U
G
messag
e
more legible
b
y
adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewr
e
n
t602
2
:
A
d
d testcase for merging a
r
e
n
amed file w
i
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
22:
N
ew tests che
c
k
i
ng for
un
n
ec
e
ssary
u
pda
t
es of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h N
e
wren
t
6
0
22: Re
m
ove unnecessar
y
untr
a
cked files to
make
test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
ah Newren
t6036: criss-c
r
oss + renam
e
/rename(1to
2
)/a
d
d-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6036: criss-cross w/ re
n
am
e
/rename(
1
to2)
/
modify+re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah New
r
e
n
t60
3
6: tests for criss-cr
o
ss merg
e
s wi
t
h
various
d
irec
t
ory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6
0
36:
c
ris
s
-
c
ross w
i
t
h
weird co
n
tent c
a
n fool g
i
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
a
h
N
ewren
t60
3
6: Add differ
e
ntly
r
es
o
lved
modif
y
/delete confli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
604
2
: Add faili
n
g testcases
for
renam
e
/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t
6042: Ensure rename/rename confl
i
cts
l
e
ave index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t604
2
: A
d
d tests f
o
r content issues wi
t
h modify/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newr
e
n
t
6042: A
d
d a
t
estcase where
undet
e
cted rename cau
s
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah New
r
en
t6042: Add a p
a
ir of cases where undetected ren
a
mes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6042: Add failing t
e
s
tcase
f
or rename/modify/add-s
o
urce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t60
4
2: Ad
d
a t
e
stcas
e
where
git
d
eletes
a
n untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
merge-recursiv
e
:
Whe
n
we
detect
we c
a
n skip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
l
ijah Newre
n
t6022:
New tes
t
che
c
king for
u
n
ne
c
ess
a
r
y u
p
d
a
tes of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
El
i
jah
N
e
w
ren
t60
2
2: New test checking for un
n
ecessary
u
p
dates
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Eli
j
ah New
r
en
A
d
d testcases
showing how pat
h
s
p
ecs are
h
a
ndled
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
El
i
jah Newren
Make rev-list --objec
t
s work together with pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
Intro
d
uce
s
a
ne
_
unse
t
a
nd use i
t
to ensure pro
p
er
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah New
r
en
t780
0
(
difftool): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t7
6
0
1
(merge-pull-conf
i
g): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lij
a
h New
r
en
t70
0
1 (mv): add m
i
ssing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t6016 (rev-list-gra
p
h-simplify-history): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t5602 (clone-remote-exec): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
e
wren
t4026 (colo
r
):
remove
u
nneede
d
and unchai
n
ed comman
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4019 (diff-w
s
error): add
lots
o
f
m
issi
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newr
e
n
t
4
202 (log): Repl
a
ce '<git-command
>
|| :' with test_might_
f
a
i
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Ne
w
re
n
t
4
0
0
2 (diff-bas
i
c): use t
e
s
t
_
might_fa
i
l for comm
a
n
d
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
ren
t100[12] (read-tree-m-
2
way, rea
d
_tree_m_u_
2
w
a
y
):
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4017 (diff-retval): rep
l
ace manu
a
l exit
c
ode check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Ne
w
ren
t3020
(
l
s-fil
e
s-er
r
or-unm
a
tc
h
):
remove st
r
ay
'
1'
f
rom
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-re
c
ursive
:
Remove redundant path
c
learing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
New
r
en
merge-recursive: Make room
f
or
directories i
n
D/F
c
onflict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
handle_de
l
ete_modi
f
y(): Check wh
e
ther
D
/
F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge_conte
n
t
()
:
Check whether D/F confli
c
ts are
s
till
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah New
r
en
conflic
t
_
rena
m
e_ren
a
me_1to2()
:
Fix checks
for p
r
esence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
con
f
l
ic
t
_rena
m
e_delet
e
(): Check whether D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge
-
recu
r
sive: Delay
modify/del
e
te con
f
lict
s
if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
N
e
w
r
en
merge-recur
s
ive
:
D
elay content merging for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
jah N
e
wren
merge-
r
e
c
ursive: D
e
lay handling of ren
a
me/delete co
n
f
licts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
ewren
merge-r
e
c
ur
s
ive: Move ha
n
d
l
ing of double r
e
name of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge
-
r
e
c
ur
s
ive: Mov
e
handling of
double rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge
-
recu
r
siv
e
: Avoid doubly merging rename/
a
dd conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rge-recursive:
Upd
a
te merge_
c
ont
e
nt
(
)
call signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lij
a
h New
r
en
merge-recursive: Upd
a
te confl
i
ct_ren
a
me_rename_1to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ija
h
Newren
merge-recursiv
e
:
Structu
r
e process_df_entry() to
h
andle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
merge-recur
s
ive:
H
ave pro
c
e
ss_entry() skip D/F or ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-recursive: New
f
unct
i
on to assist res
o
lving re
n
a
m
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recur
s
ive: Ne
w
d
a
ta structures
f
or deferri
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next