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 'jh/memihash-opt'
2017-12-22
Elijah Newren
merge-rec
u
r
s
i
v
e: avoid in
c
orporatin
g
uncommitted changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
move index_has_changes(
)
f
r
om builti
n
/
a
m
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Eli
j
ah
Newren
t6
0
44: rec
u
rsive can silently
incorpo
r
ate dirt
y
c
h
anges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
Elijah Newren
s
trbuf: remove unused stripspace fu
n
c
t
ion alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elija
h
Ne
w
r
e
n
merge-recursive
:
ignore_ca
s
e shouldn't
r
eje
c
t int
e
nti
o
nal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah Newr
e
n
sequencer:
show rename progr
e
ss during cherry picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Newren
diff: remove si
l
ent clamp of renameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
pr
o
gress
:
f
ix progress
meters when dealing with lots
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
Newren
merge-
r
ecursive: hand
l
e addition of submodu
l
e on ou
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
El
i
jah
N
ewren
sequencer:
warn whe
n
internal merge may
be su
b
optimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah New
r
en
t6
0
44: new me
r
ge testcase
s
f
or
w
hen index doesn
'
t
m
atch
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
li
j
ah Newren
merge-oc
t
opus: abort if index do
e
s n
o
t mat
c
h HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
N
e
wren
builtin/mer
g
e
.
c: fix a b
u
g with tr
i
vial m
e
r
ges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t
76
0
5: add a t
e
stcase
d
emonstrating a bug
w
ith trivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
merge-re
c
ursive: do no
t
c
he
c
k w
o
rkin
g
copy when creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah Newr
e
n
m
e
rge-r
e
c
u
rsive: remove dupli
c
ate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
New
r
en
merge-recu
r
s
i
v
e
: Don't re
-
s
ort a list whos
e
orde
r
w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recursive
:
Fix
virtual merg
e
b
a
s
e
f
o
r rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
Newr
e
n
t6
0
36: criss-cross + rename/r
e
name(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
e
rge-
r
e
c
ursive
:
A
void unnece
s
sary file rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
022:
A
d
dition
a
l
tests
c
hecking for
unnec
e
ssary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erg
e
-
r
ecursive
:
Fix spuriou
s
'refusing to lo
s
e untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6022: Ad
d
testcase for
s
p
u
riou
s
"refusing to l
o
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
e
w
r
en
mer
g
e
-
recursive: Fix wor
k
i
n
g
copy handli
n
g for r
e
na
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recur
s
i
ve: add han
d
ling
for renam
e
/r
e
name/a
d
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e: Have conflict_rename_delete re
u
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursiv
e
: Make m
o
di
f
y/
d
elete handling code reusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rg
e
-recursive: Consider modifications in renam
e
/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Ne
w
ren
merge
-
recursive: Cr
e
ate
f
u
n
ctio
n
for mergi
n
g with
branch
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive: Recor
d
more data need
e
d
for mergi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
ewre
n
merg
e
-recursive: Defer renam
e
/re
n
ame
(
2to1)
h
andli
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newr
e
n
merge-r
e
c
ursive
:
Small c
l
e
a
n
ups for conflict_re
n
ame_rena
m
e_1t
o
2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
me
r
ge-recursive: Fix
re
n
ame/rename(1to2) resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recu
r
s
i
ve: Introduce
a m
e
r
g
e
_
fil
e
convenience
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
merge-recursive: Fix m
o
dify/delete re
s
olution
in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge
-
r
e
cursive:
When w
e
detect
we can skip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recurs
i
ve: P
r
o
v
i
de more i
n
f
o
i
n confli
c
t ma
r
kers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
m
er
g
e-
r
ecursive: Cleanup an
d
con
s
oli
d
ati
o
n
of rename
_
confl
i
c
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Consol
i
date
p
rocess_entry()
a
n
d
process_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
ewren
m
e
rge-rec
u
rsiv
e
: Imp
r
o
v
e han
d
l
i
ng
o
f rename target
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
me
r
ge-recu
r
sive: Add
comments ab
o
ut hand
l
i
n
g rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah N
e
w
r
en
merge-recursive:
Make dead code for rena
m
e/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recurs
i
ve: Fix deletion of
u
n
tr
a
cked file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newren
m
e
rge-recurs
i
ve:
Split up
d
ate_sta
g
e
s
_and_entry; only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge
-
recursive: Allow ma
k
e_ro
o
m_for_path() to remo
v
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
ewren
m
erge
-
recu
r
si
v
e: Spl
i
t was_tra
c
ked() out of
would_lo
s
e_
u
ntra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursive: S
a
ve D
/
F co
n
flict fi
l
enames in
s
t
e
ad
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewre
n
merg
e
-recur
s
iv
e
: Fix
c
o
de c
h
ecking
for D/F confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-re
c
ursive
:
Fi
x
sorti
n
g order
a
nd dire
c
tory ch
a
nge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
merge-recu
r
sive: Fix
r
ecursive cas
e
with D/
F
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
r
e
n
merge-
r
ecur
s
ive: Avoid
w
orking directory changes during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
Newren
m
e
rge-recursive: Rememb
e
r to
f
r
ee generated unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newre
n
merge-recursiv
e
: Consolidate different
u
p
d
a
te_sta
g
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h New
r
en
merge-r
e
cur
s
ive: Mark some d
i
f
f_filespec s
t
ruct arguments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erg
e
-recursive: Correct
a com
m
ent
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
merge
-
recursive: Make BU
G
message more legib
l
e by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022:
Add te
s
tcase for merg
i
ng
a
renamed fi
l
e
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t6022
:
N
ew
t
ests checking for unnecess
a
ry updates
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t
6
02
2
: Re
m
o
ve unnecessary untracked
files to
m
a
k
e
test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036:
c
riss-cr
o
ss
+
rename/rena
m
e(1to2)/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ew
r
en
t
6
036: criss-cro
s
s w/ rename/ren
a
me
(
1to2)/modify+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6036: tests f
o
r criss-cros
s
m
e
rg
e
s with var
i
ous d
i
rectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h N
e
wren
t
6036: criss
-
cross with
we
i
r
d
content
c
an fool git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t
6036: Add di
f
f
e
rently resolved modify/dele
t
e conf
l
ict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add f
a
i
l
i
n
g
test
c
as
e
s for
rename/ren
a
m
e
/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
r
en
t6042: Ensure r
e
name/renam
e
conflicts leave
i
nd
e
x and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newre
n
t6042
:
Add tests for
c
ontent issu
e
s
w
ith
m
odify/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6042: Add a testca
s
e
w
h
ere undete
c
ted re
n
ame causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6042:
Add a pa
i
r of cases where unde
t
ected renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add failing
te
s
tca
s
e
for renam
e
/modify/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah
N
ewren
t6042: Add a testcase w
h
ere
git dele
t
es
an untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
merge-r
e
cursive:
W
h
e
n we detect w
e
ca
n
ski
p
an upd
a
te
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Ne
w
ren
t6022: New t
e
st checkin
g
for unne
c
es
s
ary updat
e
s of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
El
i
j
ah Newren
t6022:
N
ew test checking for unnecessary updates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah Newren
Add testcases showing
h
o
w pathspecs are ha
n
dle
d
with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah
N
ew
r
en
Make rev-list --objects
work together with
p
at
h
s
p
ecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Ne
w
ren
Introduce sane_uns
e
t and use
it to ensure
p
ro
p
e
r
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newr
e
n
t7800 (difftool
)
: add missi
n
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
t7601 (mer
g
e-pu
l
l-
c
onf
i
g): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newren
t7001
(
mv):
a
dd missi
n
g &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t6
0
1
6
(rev-list-gra
p
h-simp
l
if
y
-history):
add missing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
t
5
6
0
2 (clone-remote-exec): add m
i
ssing
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h Ne
w
re
n
t
4
026 (color):
r
emove u
n
n
eeded
a
nd unchai
n
ed comman
d
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 mis
s
i
ng &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t420
2
(log): Replace '<git-com
m
a
n
d> || :' wi
t
h
test_migh
t
_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
j
a
h Newren
t4002 (diff-basi
c
): use test_mig
h
t_f
a
i
l
for
c
omma
n
ds
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t100[12] (r
e
ad-tre
e
-m
-
2
w
ay, read_tr
e
e_m_u_2way
)
: add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4017 (
d
i
f
f-re
t
val): replace manu
a
l ex
i
t code check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elijah
N
e
w
re
n
t302
0
(l
s
-files-er
r
or-u
n
match): rem
o
ve stray
'1'
from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
m
e
rge-
r
ecursi
v
e: R
e
mov
e
redunda
n
t path c
l
ea
r
ing
for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
merg
e
-rec
u
rsiv
e
:
Make ro
o
m for directo
r
ies in D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ij
a
h Newren
handle_delete_m
o
dify(): Check
w
hethe
r
D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
N
e
w
ren
merge_content():
Ch
e
c
k
whether D/F con
f
licts
a
re
still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
conflict
_
rename_rename_1to2(): Fix checks for
pr
e
senc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newr
e
n
con
f
lict
_
rename_d
e
let
e
(): Check w
h
ether D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rge-r
e
c
u
r
sive: Delay modi
f
y
/
delete con
f
licts if
D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
m
erge-recurs
i
ve: De
l
ay content
m
erging
for renam
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newre
n
merge-recu
r
sive
:
Delay handling o
f
r
e
name
/
d
e
l
ete
c
onflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merge-
r
ecur
s
ive: Mov
e
han
d
l
ing o
f
double
ren
a
me of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newre
n
merge-recu
r
sive: Move handling
o
f double rena
m
e of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next