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
RelNotes 2.18: clarify where directory rename detection applies
2018-06-13
Elijah Newren
RelNotes 2
.
18:
clarify where d
i
rectory ren
a
me detection
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-06-01
E
l
ijah Newren
RelNo
t
es: remo
v
e du
p
licate release
n
ote
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-25
E
l
ij
a
h Newren
rev-parse: chec
k
lookup'ed c
o
mmit refere
n
ces fo
r
NULL
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-20
E
l
ij
a
h Newren
me
r
ge-recur
s
ive: provide pair of `
u
npack_trees_{sta
r
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-rec
u
rsive: fix
c
he
c
k
fo
r
skipab
i
lity
o
f working
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
merge-recursive: make "A
u
to-merging" commen
t
s
h
ow for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ijah Newren
merge-recursive: fix rem
a
in
d
er of
w
as_dirty() t
o
use
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-r
e
cursi
v
e: f
i
x was_tracked
(
) to q
u
it
l
ying with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
t
60
4
6:
testcases che
c
king whe
t
her update
s
can
b
e skipp
e
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-recursive: avoid trigg
e
r
ing a
d
d_c
a
cheinfo error
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
e
wren
merge-recu
r
s
i
ve: move mor
e
i
s
_dirty handling to merge_content
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-recu
r
sive
:
improve add_cache
i
nfo erro
r
handling
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newr
e
n
merge-r
e
cursive: avoid spuriou
s
re
n
ame/re
n
ame
c
onflict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah N
e
wren
directory renam
e
detec
t
ion: new t
e
stca
s
es
s
howca
s
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
El
i
jah Newren
merge-recurs
i
ve: fix remaining d
i
rector
y
rena
m
e
+ di
r
ty
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elija
h
Newren
me
r
g
e-recu
r
sive: fix o
v
erwri
t
ing dirty files i
n
vol
v
ed
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ew
r
en
merg
e
-
recursive: avoi
d
clobb
e
ri
n
g
untrack
e
d files with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
lija
h
Newren
m
erge-recursiv
e
: apply
n
ecessary modifi
c
a
ti
o
n
s
for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Newren
merge-rec
u
rsive: when c
o
mparing
f
ile
s
, don
'
t include
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
E
l
ij
a
h Newren
merge
-
recursiv
e
: check for file le
v
el conflicts the
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah Ne
w
ren
m
erge-rec
u
rsive: a
d
d computation of collisions du
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Elijah
N
ewren
merge
-
recursive:
c
heck for
d
irectory lev
e
l confl
i
cts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-08
Eli
j
ah Newren
mer
g
e-recursiv
e
: add get
_
di
r
ectory_ren
a
m
es()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-05-02
Eli
j
ah Newr
e
n
unpack_trees: fix breakage
w
hen o->
s
rc_ind
e
x
!=
o
-
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-25
El
i
jah Newren
Make
runni
n
g
g
it under other debu
g
ger-
l
ike programs
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elij
a
h
Newren
merge-rec
u
rsive: m
a
ke a helper function
for cleanup
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah New
r
en
m
e
rge-r
e
cur
s
i
ve: split ou
t
code for dete
r
mini
n
g d
i
ff_fil
e
p
a
irs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
merge-recursive: m
a
k
e
!o
-
>d
e
tec
t
_rename
code
p
ath more
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
m
e
rge-recursive
:
fix
l
eaks of a
l
loc
a
ted renames and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah New
r
en
merg
e
-recursive: introduce
n
e
w
functions to handl
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ew
r
en
merge-recursive: move the get_rename
s
() funct
i
on
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah
N
ewren
direc
t
ory
r
e
name detecti
o
n: te
s
ts for ha
n
dling overwrit
i
ng
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elija
h
N
ewren
d
ir
e
ct
o
ry rename de
t
ection: tests for
h
an
d
li
n
g over
w
r
iting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
N
ewren
di
r
e
ctory rename d
e
tection: miscellaneo
u
s testcases
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
dir
e
ctory rename detecti
o
n
:
test
c
ase
s
exploring possibl
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory rename dete
c
tion: more involved edge/corn
e
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory r
e
name de
t
ection: testcases
c
hecking
w
hich
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
directory
r
ename detection: f
i
les
/
dire
c
t
or
i
es in the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah
Newren
directory rename detection:
p
a
r
tially
r
enamed directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Eli
j
ah
Newren
direct
o
ry rename
d
e
tection: testcases t
o
avoid t
a
king
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
Elijah Newren
dir
e
c
tory rename detection: dire
c
tory
s
plitting testcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-20
E
l
ijah Newre
n
d
irectory rename detection: basic
t
e
s
tcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-09
Elijah
N
ewren
Docu
m
ent
a
tion:
normalize spe
l
l
i
ng of 'normalised'
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-04-09
Elijah
Newren
Documentation: fix several one-charact
e
r-off spelling
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elij
a
h Newren
merge-re
c
u
rsive: e
n
sure we w
r
ite updates f
o
r directory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah
Newren
m
e
rge-recursive: avoid
s
p
urio
u
s
r
e
name/renam
e
con
f
lict
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
directory rename
dete
c
tion: new t
e
st
c
ases s
h
owca
s
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Newren
merg
e
-recursive:
fix remaining directory rename + dir
t
y
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
El
i
j
a
h Ne
w
ren
merge-recursive:
f
ix o
v
erwriting dirty files invo
l
v
e
d
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
Elijah Ne
w
r
en
merge-
r
ecursive:
avoid clobbering unt
r
acked
f
iles with
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-27
E
l
ijah Newren
merge-rec
u
rs
i
ve:
app
l
y necess
a
r
y
modif
i
cati
o
ns for
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newre
n
merge-recu
r
sive: wh
e
n compa
r
i
ng files, d
o
n
'
t include
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-r
e
cu
r
sive: c
h
e
c
k for
fi
l
e level co
n
flicts
t
h
e
n
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-r
e
cursive: add com
p
utation of
c
o
lli
s
ions due
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-recursive:
c
heck for
directory level conflicts
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah New
r
en
merge-recursive: add get_dir
e
ctory_renames()
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah
Ne
w
ren
merge-recursive:
ma
k
e a helper
f
uncti
o
n for
cleanup
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elija
h
N
e
wren
m
erge-recursive: spl
i
t out code for
d
e
termining
di
f
f_filepairs
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
merge-
r
ecursive: make !o->detect
_
r
e
n
ame codep
a
th more
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewren
merge-recurs
i
ve: fix leaks of allocated ren
a
mes and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
m
erg
e
-recur
s
i
v
e: introduce new
functio
n
s to handle
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah
N
ewren
merge-recursive: mov
e
the get_rename
s
() functio
n
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
i
j
a
h
Newren
direct
o
ry
r
en
a
me detection:
tests for ha
n
d
ling overwri
t
ing
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Ne
w
ren
di
r
ect
o
ry rename d
e
t
e
ction: tests for handling o
v
erwriting
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elij
a
h Newren
direc
t
or
y
rena
m
e detect
i
on: miscellaneous
testc
a
ses
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Eli
j
ah Newren
dire
c
tory
re
n
a
m
e detection: t
e
stcases exploring possibly
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
El
i
jah Newren
d
i
rec
t
ory rename detection: m
o
re involved
e
dge/co
r
ne
r
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah
Newren
d
i
rectory rename detection
:
testc
a
ses checking whi
c
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
dir
e
c
t
or
y
r
enam
e
dete
c
tion: file
s
/
d
irectories in the
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
E
l
ijah N
e
wren
dire
c
tory rename detection
:
partia
l
ly renamed dire
c
tory
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah
N
ewr
e
n
d
i
r
e
ctory rename
detection: testcases to avoid taking
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newren
directory r
e
name
d
etection: d
i
rect
o
ry spl
i
tting tes
t
cases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-02-14
Elijah Newr
e
n
directory rename d
e
tecti
o
n
:
b
a
sic
t
e
stcases
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elijah Newre
n
m
e
r
g
e
-
r
e
c
ursive: add ex
p
lanati
o
n fo
r
src_entry and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Eli
j
a
h Ne
w
ren
merge-recursive:
f
ix logic ord
e
ri
n
g
i
ssue
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2018-01-19
Elij
a
h
N
ew
r
en
Tighten and correct a few testcas
e
s for mer
g
ing and
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah
N
ewren
mer
g
e-recursive: avoid in
c
or
p
orating uncommitted changes
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
m
ove
index_has_changes() from builti
n
/
am
.
c to
m
erge
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t604
4
: re
c
urs
i
ve can silently inc
o
rpo
r
ate di
r
t
y chan
g
es
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-12-05
Elijah
Newren
str
b
uf: remove
u
nu
s
e
d
s
t
ripspace fu
n
cti
o
n alias
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-27
Elijah
N
ewr
e
n
merge-recur
s
ive: ig
n
ore_case shouldn't r
e
jec
t
i
n
tentional
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
Newren
sequencer: show
r
enam
e
pr
o
g
ress
d
uring cherry picks
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
diff: remo
v
e s
i
le
n
t clam
p
of renameLimit
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
p
rogress: f
i
x pro
g
ress meters when de
a
ling
w
i
th
l
ots
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-15
Elijah N
e
wren
merg
e
-
r
ecursive: handle addition o
f
submodu
l
e on
our
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2017-11-14
Elijah Newren
seq
u
en
c
er: wa
r
n
w
hen
internal merge
m
ay be
s
uboptimal
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
t6044: new merge t
e
stcases for when index doesn't mat
c
h
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah Newren
merge-
o
ctop
u
s
:
a
b
ort
i
f in
d
ex does not match HE
A
D
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
Newren
builtin
/
m
erge
.
c: fix a bug with trivial merges
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
E
l
ijah Newre
n
t7605
:
add a tes
t
c
a
se demonstr
a
ting
a
bu
g
wi
t
h trivial
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
merge-recursiv
e
:
do not check wor
k
i
n
g
copy when
creating
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2016-04-13
E
lijah Newr
e
n
merge-re
c
ur
s
ive: r
e
m
o
v
e
duplica
t
e cod
e
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah New
r
en
merge-recursiv
e
: Do
n
't re-sort a list whos
e
order
w
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
en
merge-recursive: Fix virtual merge base for
r
ename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah New
r
en
t603
6
: cri
s
s-cros
s
+
r
en
a
m
e
/
rename(1to2)/add-des
t
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
merge-recursi
v
e
: A
v
oid unnecessar
y
file re
w
rites
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
e
wren
t6022: A
d
ditional
tes
t
s c
h
e
c
k
ing for u
n
nece
s
sar
y
updates
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
me
r
ge-r
e
c
ursi
v
e:
Fix
s
purio
u
s 'refusing to lose untracked
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
t6022: Add t
e
s
tcase for spuri
o
us
"
refu
s
ing
t
o lo
s
e
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h
Newren
merge-recursive: Fix
working copy ha
n
d
l
ing for rename
.
.
.
Signed-off-by: Elijah Newren <
newren@gmail.com
>
commit
|
commitdiff
|
tree
next