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
t5526: test recursive submodules when fetching moved submodules
2018-06-13
Elijah New
r
en
RelNotes 2
.
1
8
: cl
a
rify where d
i
rectory r
e
name detection
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-06-01
El
i
ja
h
N
ewren
RelNotes: remove
d
u
plicate release note
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-25
Elijah
N
ewren
rev-par
s
e: check look
u
p'ed
c
o
m
m
it r
e
f
er
e
nces
f
or
NULL
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-20
Elijah Newre
n
merge-recur
s
i
v
e
:
p
r
ovide
pair
o
f
`unpa
c
k_trees_
{
s
t
art
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive: fix check for
skipabi
l
ity of working
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
erge-re
c
u
r
sive: make "
A
uto-
m
ergi
n
g" c
o
mment show for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
Newre
n
merg
e
-re
c
ur
s
ive: fix re
m
a
i
nder
of was_dirt
y
() to
use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newre
n
m
e
rge-rec
u
r
s
ive: fix was_
t
racked() to
q
uit lying wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
t6046: testcases che
c
ki
n
g whether
upda
t
es can be skipped
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive:
a
v
o
id
triggerin
g
a
dd_
c
acheinfo error
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ija
h
Newren
merge-recursive:
m
ove mo
r
e is_dirty h
a
ndling
to merge_co
n
t
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
a
h
N
e
wren
m
erge-recu
r
si
v
e: improve
add_cach
e
info
error han
d
ling
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
m
e
rge-recursive: avo
i
d s
p
urio
u
s rename/rename
co
n
fli
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
N
ewre
n
direct
o
ry rename d
e
tection: new testcases
showc
a
sing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merg
e
-rec
u
rsive: f
i
x rem
a
i
n
ing directory rename + dirty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah N
e
wren
mer
g
e-recursive
:
fix ov
e
r
w
r
i
ti
n
g dirty f
i
l
e
s
inv
o
lved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah
Newren
mer
g
e-recursive: avoi
d
clobbe
r
ing untracked f
i
les w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
m
e
rge
-
r
ec
u
r
s
ive: appl
y
necessary mod
i
f
i
catio
n
s f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recurs
i
ve: when compar
i
n
g
files, don't
inc
l
ude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah
Newren
merge-recursive: check for fi
l
e le
v
el co
n
fl
i
c
ts
then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
E
lijah New
r
e
n
merge-recursive: add compu
t
ation of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
r
e
n
merge-recursive: che
c
k for
directory level c
o
nflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge
-
rec
u
rsi
v
e: add get_directory_renam
e
s()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-05-02
Elij
a
h Newr
e
n
unpa
c
k_
t
rees: fi
x
breakage when o->src_index != o
-
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-25
El
i
jah N
e
w
r
en
Make running git unde
r
oth
e
r debug
g
er-like pro
g
r
a
ms
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive:
make a h
e
lper f
u
nction for cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah N
e
wren
merge-recur
s
ive: split out code fo
r
determining
diff_fi
l
epairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah Newren
mer
g
e-recursive: make
!
o->
d
e
t
ect_rename
c
o
depath m
o
re
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
m
erge-recursive
:
f
ix leaks o
f
allocated renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
merge-re
c
ursive: introduce new
f
unctions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
lij
a
h Newr
e
n
merge-recursi
v
e
:
move the get_renames()
function
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
New
r
e
n
d
i
re
c
tory re
n
a
m
e detec
t
i
o
n: tests fo
r
ha
n
dl
i
ng overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h Newr
e
n
d
i
rectory rename detect
i
on: tes
t
s
for handling overwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah New
r
en
d
i
rectory rename detecti
o
n: mi
s
cellane
o
us te
s
tcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
El
i
jah Newren
directory ren
a
me detection: testcases exploring po
s
sibl
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
Newr
e
n
direc
t
ory rename
d
e
t
ec
t
ion
:
m
o
re inv
o
lved
edge/corne
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
director
y
r
e
n
ame
d
etection: testcases ch
e
cking
w
hich
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah N
e
wren
director
y
rename detection:
files/dir
e
c
tories in the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newre
n
d
i
rectory re
n
ame
d
e
t
ection: partial
l
y r
e
named direct
o
ry
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
r
ename de
t
e
c
tion
:
testca
s
es to avoid taki
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah
Newren
dir
e
ctory rename
d
et
e
ct
i
on: directory splitting testc
a
s
e
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
e
wren
d
irectory rename detect
i
on: basic testc
a
ses
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elija
h
Newren
Documentation: nor
m
ali
z
e
sp
e
lling o
f
'norma
l
ised
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newren
D
ocu
m
e
n
tation: fix seve
r
a
l
one-charac
t
er-off spelling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newren
m
e
rge-r
e
cursi
v
e: ensur
e
we write updates
for
d
irectory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
m
e
r
ge-recursive: avoid spu
r
ious rename/re
n
a
me conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h
Newre
n
d
i
r
e
ctory rename detec
t
ion: new tes
t
cases showcasi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
E
l
i
j
ah Newren
m
e
rge-rec
u
rsiv
e
: fix
r
emaining dir
e
ctory renam
e
+ di
r
ty
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
New
r
en
merge-recursive: fix ove
r
writ
i
ng dirty
f
i
les
i
nvolved
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
N
ewren
merge-recurs
i
v
e
: av
o
i
d clobbering
u
ntracked files with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-27
Elija
h
Newren
m
e
r
g
e-recur
s
ive:
a
p
ply necessary modificat
i
ons for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
e
rge-rec
u
rsive: whe
n
compa
r
ing fil
e
s
,
don't inc
l
ude
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: check
for
f
ile level
c
o
n
fl
i
cts then
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
m
e
r
g
e-recu
r
sive: add computation of collisions due
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
e
w
ren
merge-re
c
ursi
v
e: check for directo
r
y
level confli
c
ts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erge-r
e
curs
i
ve: add get_dire
c
t
o
ry_
r
e
name
s
()
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
lijah Newren
merge-
r
ecursive: make a helper fun
c
t
i
on
for
cleanup
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah N
e
wren
m
e
r
ge-recursive: sp
l
it out co
d
e for determining dif
f
_filepairs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive: ma
k
e !o->detect
_
renam
e
codepath more
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
Ne
w
re
n
m
erge-recursiv
e
: fix leaks of alloca
t
ed
renames and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
merge-recu
r
sive:
in
t
r
o
duce ne
w
functions to handle
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
me
r
ge-re
c
ursive
:
m
o
ve
t
he ge
t
_renames() functio
n
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
dire
c
tory re
n
ame de
t
ection:
t
e
sts for handling ove
r
writing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
dire
c
tory
re
n
ame detection
:
tests for handling o
v
e
rwriting
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
e
w
r
en
dir
e
ctor
y
renam
e
detection: misc
e
llaneous testcases
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
a
h N
e
wr
e
n
d
i
rectory
r
e
n
ame
detec
t
ion:
t
estcases exploring p
o
s
s
i
bly
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah N
e
wren
d
irecto
r
y rename detection: more in
v
o
lved edge
/
corner
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
directory r
e
name detection: tes
t
c
ases check
i
ng which
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
directory rename detection: files/directories in t
h
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
Newren
directory ren
a
m
e
detection: partiall
y
re
n
amed
direc
t
ory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
directory rename detection: testcases
t
o
avoid ta
k
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
d
irectory
rename detecti
o
n: directory s
p
litting testcases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h
New
r
e
n
directory rename d
e
t
e
ction:
b
asic test
c
ases
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Eli
j
ah Ne
w
ren
m
e
rge-
r
e
c
u
r
sive: add explanat
i
on f
o
r s
r
c_en
t
ry and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah
N
ewren
m
er
g
e-recurs
i
ve:
f
ix log
i
c ordering i
s
s
u
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-01-19
Elijah
N
ewre
n
Tig
h
ten a
n
d
c
orrect a
fe
w
testcases fo
r
mergi
n
g
and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
E
l
ij
a
h N
e
w
r
e
n
merge-
r
ecu
r
sive: avoid incorporating
u
ncommitted ch
a
nges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah
N
ewren
move inde
x
_has_changes() fr
o
m
builtin/am
.
c to merge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
El
i
jah
N
ew
r
en
t6
0
44: r
e
cursive can si
l
ently incorporate dirty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
E
l
i
ja
h
Newren
strbuf: remove unu
s
e
d strips
p
ace funct
i
o
n alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
E
l
ija
h
Newre
n
merge
-
recu
r
sive: ign
o
r
e_case s
h
o
u
ldn'
t
reject in
t
enti
o
n
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Ne
w
ren
sequencer
:
s
h
ow rename
progress d
u
ring che
r
ry p
i
c
k
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Ne
w
ren
diff: remove
s
i
l
ent cla
m
p of ren
a
meLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
El
i
jah Newren
p
r
ogress
:
fi
x
progress meters when dealing with lo
t
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
lijah
Newren
merge-rec
u
r
sive: h
a
n
dle ad
d
ition of
submo
d
ule on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah
N
ewren
seq
u
e
n
c
e
r
: warn when
internal merge may be subop
t
imal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lija
h
Newren
t604
4
: new
merge testcases f
o
r when i
n
dex doesn't m
a
tc
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newr
e
n
m
e
rge-octopus
:
a
b
ort if index
d
oes no
t
match
H
EAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
builtin
/
m
e
r
g
e
.
c:
f
ix
a b
u
g w
i
th trivia
l
mer
g
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
E
lij
a
h
Newren
t7605
:
add
a
t
e
s
t
cas
e
demon
s
trating a bug with tri
v
ial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
m
erge
-
recursive: do not
ch
e
c
k
w
ork
i
ng copy when cre
a
t
i
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah New
r
e
n
merge
-
rec
u
rsive: remove
d
u
plicate code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive
:
Don't re-
s
ort
a
list
whose order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recursive: Fix virtual me
r
ge b
a
se for
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t
6
036: criss-cross +
r
ename/ren
a
me(1to
2
)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
m
e
rge-recursive:
Avoid
unn
e
cessary file
rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6022: Add
i
tional tests checkin
g
for
unnecessary updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
merge-rec
u
rsive: Fix spur
i
ous 'refusing to
l
ose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t602
2
: Add testcas
e
f
o
r spu
r
io
u
s "refusing to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
a
h
N
ewren
merge-recursive: Fix working copy h
a
ndling
f
or rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next