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 branch 'jk/doc-diff-options'
2017-12-22
Elij
a
h Newren
m
e
rge
-
recursi
v
e:
a
void inc
o
r
p
orating
u
ncommitte
d
c
hanges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
i
j
a
h
Newre
n
m
o
v
e
index_has_chan
g
es()
f
rom b
u
iltin/am
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Eli
j
ah N
e
wre
n
t
60
4
4
:
recursive ca
n
si
l
ently incor
p
o
rate dirty ch
a
nges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
strbuf
:
rem
o
ve unu
s
ed
s
tr
i
pspace fu
n
ction alia
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah Newr
e
n
merge-recur
s
ive: ignore_case sh
o
uldn't rejec
t
inte
n
tional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
N
e
w
ren
sequenc
e
r: show
r
ename progress dur
i
ng cherry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah New
r
en
d
iff: r
e
m
o
v
e
silent cla
m
p
of renameLim
i
t
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
Newren
progress: fix progress m
e
ters when
d
e
aling with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah Newren
m
e
r
g
e-recursive:
h
andle additio
n
of
s
ubmod
u
le on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Ne
w
ren
sequencer: warn when in
t
e
rnal merge may
b
e subopti
m
al
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah N
e
wr
e
n
t6044: n
e
w merge testca
s
es f
o
r when index doesn't
m
atch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah
Newren
merge-
o
ctopus: abort if index does not
m
atch H
E
AD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
N
e
wren
bui
l
tin/merge
.
c
:
f
i
x
a
bug wit
h
tr
i
vi
a
l m
e
r
g
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t7605: add a testcase d
e
m
onstrating a
b
ug with trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah New
r
e
n
merge-recursive: do not check working copy when creati
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-recursive: remove duplicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-recursive
:
Don't re-sort a lis
t
whose
o
rder we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
re
n
merge-recursive: Fix virt
u
al me
r
ge base f
o
r ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6036: criss-c
r
oss + rename
/
rename(1to2)/add-
d
es
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive: Avoid un
n
ecessary file rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t6022: Addit
i
onal tests
check
i
n
g
fo
r
unnece
s
sar
y
updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recurs
i
ve:
F
ix spurious
'r
e
fusing t
o
l
ose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Ne
w
ren
t6022: Add
t
estcase for s
p
u
r
i
ous
"refusing
to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h
New
r
en
merge-re
c
ursiv
e
: Fix working c
o
py handling for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
merge-recursive:
add handling for rename/re
n
am
e
/a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h
New
r
en
m
e
r
ge-recur
s
iv
e
: Have co
n
flict
_
rename_del
e
te reuse
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e-recursive: Make modify/d
e
lete hand
l
ing code reusa
b
le
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-re
c
ursiv
e
:
C
onsi
d
e
r m
o
d
i
fications in
rena
m
e/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
m
erge-recursi
v
e: Create funct
i
on fo
r
merging
wit
h
branchname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-
r
ecursive: Record more data needed for me
r
g
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-rec
u
rs
i
ve: D
e
fer rename/renam
e
(2to1) handling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merg
e
-
r
e
cursive: Small clean
u
ps
f
or
c
onflict_rename_rename_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge
-
recursive:
Fix re
n
am
e
/rename(1to2) resol
u
tion
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: Introduc
e
a merg
e
_
f
ile con
v
en
i
ence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-recur
s
ive: Fix
m
odify/delete resolutio
n
i
n the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah 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 New
r
en
merge-
r
e
c
ursive: Provi
d
e more i
n
fo in c
o
nfl
i
c
t
mar
k
e
r
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Ne
w
r
e
n
merge-recursive
:
C
l
eanup and consoli
d
a
t
i
o
n o
f
ren
a
me
_
c
onflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge-recursive: Consolidate p
r
oce
s
s_entry() an
d
process
_
df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah New
r
en
me
r
ge-recurs
i
ve
:
Improve handling of rena
m
e target
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recur
s
ive: Add comm
e
n
ts about handling r
e
nam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-r
e
cur
s
iv
e
: Make de
a
d code fo
r
rename/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Fix deleti
o
n of
untr
a
cked
file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah New
r
en
merge-recursive: Split update_
s
tage
s
_
a
nd_en
t
r
y
;
only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
merge-recursive: All
o
w m
a
ke_r
o
om
_
for_
p
ath
(
) to remove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
ren
merge-recursive: Split was_
t
r
acked() out of
would_l
o
se_unt
r
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
mer
g
e
-recursive: Save D/F conflict file
n
ames
inste
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recursive: Fix
c
ode check
i
ng f
o
r D/F confli
c
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newren
merge-recursive: Fix sort
i
n
g or
d
e
r
and dire
c
tory
chang
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-r
e
cursive: Fix re
c
ursive c
a
se wi
t
h
D/F
c
onfli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
mer
g
e-recursi
v
e: Avoid
w
o
r
king directory changes dur
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
mer
g
e-re
c
u
r
sive: Reme
m
ber
t
o free ge
n
erate
d
unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recur
s
ive: Consolidate d
i
fferent upda
t
e_stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
er
g
e-recursive
:
Mark some diff_fil
e
spec struct
arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
a
h
New
r
en
m
e
rge
-
recursi
v
e: Co
r
rect a comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
e
rge
-
recursive:
M
a
k
e B
U
G message more legible by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: A
d
d testcase for
m
ergin
g
a rename
d
fil
e
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
t6022: New
t
e
s
ts check
i
ng for unnece
s
sar
y
updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
New
r
en
t60
2
2: R
e
move unneces
s
ary
u
ntracked files to make test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6036:
c
riss-cross + re
n
ame/rename(1t
o
2)/add-sou
r
ce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newr
e
n
t6036: criss-
c
r
o
ss w/ rename/r
e
name
(
1to2
)
/modif
y
+
renam
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah New
r
en
t6036: tests for criss-cross merges with
v
ariou
s
d
i
r
e
ctory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6036: cr
i
ss-cross with weird content c
a
n foo
l
g
i
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t
6
036: Add differentl
y
r
e
s
olved modify/
d
elete conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add
failing t
e
stc
a
ses for
r
en
a
me/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6042: Ensure
re
n
ame/rename conf
l
i
c
t
s leave index
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t
6
042: Add t
e
s
ts for content i
s
s
ues wi
t
h modi
f
y/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6042: Add a t
e
s
t
case
w
here und
e
tec
t
ed rename causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t604
2
: Add a pai
r
of
cases whe
r
e
u
n
d
etecte
d
renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
ah Newren
t6042
:
Add
failing te
s
t
case for r
e
n
a
me/
m
odify/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t60
4
2: Add a test
c
ase
where gi
t
d
e
le
t
es an untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elija
h
Newren
merg
e
-recursive: When we de
t
ect
we can skip an upd
a
te
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah New
r
e
n
t6022: New test check
i
ng for unnec
e
ssary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
t6022: New
te
s
t ch
e
ckin
g
for unneces
s
ary updat
e
s
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Add testcases showing how path
s
pecs
are ha
n
dle
d
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
El
i
jah
N
ewren
Mak
e
rev-list
--objects work
together with pathspe
c
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
Introduce s
a
ne_u
n
set a
n
d
u
se it to ensure proper &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newre
n
t78
0
0 (difftoo
l
): add m
i
s
sing &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t
7
6
01 (merge-p
u
l
l-con
f
i
g): a
d
d missing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t
7001 (mv): ad
d
missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Ne
w
ren
t6016 (rev-list-graph-simplify-h
i
st
o
r
y
): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t560
2
(clone-remo
t
e-exec): add mi
s
sing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
e
w
ren
t
4
026
(colo
r
):
rem
o
ve un
n
eeded and unchained comma
n
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
t401
9
(diff-wserror): add lots o
f
m
issing &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wren
t
4
202 (log): Replace '<git-command>
|
|
:
' wit
h
test_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newr
e
n
t4002
(
d
iff-basic): us
e
test_might_fail for comman
d
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
N
e
wren
t100
[
1
2
] (read
-
tree-m-2wa
y
, read_tree_m_u_2way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Newren
t4017 (diff-
r
et
v
al): r
e
place manual exit code check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah Newre
n
t302
0
(ls-files-error-
u
nmatch): rem
o
v
e
stray '1'
f
rom
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah
Newre
n
merge
-
recursive: Remove redund
a
nt
path clearing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-recursi
v
e: Make room for directori
e
s in
D/F
c
onflict
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
handl
e
_delete_mo
d
ify(): Check
w
hether
D/F conflic
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h
Newr
e
n
merg
e
_content():
Check w
h
et
h
er
D/F conflicts are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
conf
l
i
c
t_
r
e
name_ren
a
m
e_1to2(): Fix ch
e
ck
s
f
o
r presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Ne
w
ren
conflict_re
n
ame_d
e
lete(
)
:
Check whether D/F confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
mer
g
e-re
c
ursive:
Delay modify/de
l
ete co
n
fl
i
cts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
Newren
merg
e
-re
c
ursive: Delay con
t
ent merg
i
ng for renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h Newren
merge-re
c
urs
i
ve:
D
elay h
a
ndling of rename
/
del
e
te c
o
nfl
i
c
t
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
Newren
mer
g
e-recu
r
sive: Move handling of d
o
ubl
e
rename of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-recursive: Move handling of double rena
m
e of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next