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
Documentation: normalize spelling of 'normalised'
2018-04-09
Elijah Newr
e
n
D
o
cument
a
t
i
on: norma
l
ize spelling of
'
nor
m
ali
s
e
d
'
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2018-04-09
Elijah Newre
n
Doc
u
mentati
o
n: fi
x
several one-ch
a
r
a
c
t
er-off spel
l
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Ne
w
ren
merge
-
rec
u
rs
i
ve: avoid
i
ncorpo
r
ating u
n
committed
c
h
anges
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah
Newren
move in
d
ex_has_changes()
f
r
o
m
bui
l
tin
/
am
.
c to mer
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
t6044: recursive ca
n
sil
e
ntly incorpo
r
a
te
dirty changes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-12-05
E
li
j
ah Newren
st
r
buf
:
rem
o
ve u
n
used stripspace
f
unct
i
on alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
E
l
ijah New
r
en
me
r
ge-rec
u
rsive: ignore_
c
a
s
e shouldn't reject intent
i
onal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
E
l
ijah Newren
sequen
c
e
r
:
sh
o
w rename progress during ch
e
r
r
y picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
diff: remove silent c
l
a
m
p o
f
rename
L
i
m
it
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Ne
w
ren
p
rogress: fix p
r
ogress meters when dea
l
ing with l
o
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Ne
w
ren
merge-rec
u
rsiv
e
:
handle
addition of submodu
l
e
on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah N
e
wren
sequencer: warn when internal merge may
be s
u
boptima
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t
6
0
44: ne
w
merge testcases for when index d
o
e
sn't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
merge-octopus: ab
o
rt
i
f index do
e
s not match HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h Newren
builtin/me
r
ge
.
c: fix a bug w
i
th trivial
merges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
t7605:
a
dd
a
tes
t
case d
e
monstrati
n
g
a bug with trivi
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah
Newren
merge-
r
ecursi
v
e: do not
c
heck working copy when
c
reating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
mer
g
e-
r
ec
u
rsive: remove duplicat
e
code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
m
e
rge-recursive: Don't re-sort a list wh
o
se order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursiv
e
: Fi
x
vi
r
tual m
e
rge bas
e
for
ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
ren
t6
0
36: criss-cross + r
e
n
ame/renam
e
(1to2)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-
r
e
c
u
rs
i
ve: Avoi
d
unnecessary fi
l
e rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
a
h
Newren
t602
2
: A
d
ditio
n
al tests
checking
f
or
u
n
ne
c
essar
y
updates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
me
r
g
e-re
c
ursi
v
e: Fix spurious 'refusin
g
t
o
lose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newre
n
t
6022:
A
d
d
test
c
ase for
s
purious "refu
s
ing
to
l
ose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e: Fix working copy
h
and
l
ing for ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recursive: add handling for
rename/ren
a
m
e/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
mer
g
e-recursive: Have
c
onflic
t
_rename_delete reu
s
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
merge
-
recursive: Make
m
odify/delete handl
i
ng
c
o
de re
u
sable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
m
erge
-
recu
r
sive: Consider modifica
t
ions in rename/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
ewren
merge-r
e
cursive
:
Create function
for merging with branc
h
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
merge-re
c
urs
i
ve: Record mo
r
e
d
a
t
a
needed for merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merg
e
-recurs
i
ve: Defer r
e
name/
r
en
a
me(2to1)
handl
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursi
v
e: Sma
l
l
c
l
eanups for c
o
nflict_rename_r
e
name
_
1
t
o2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
merge
-
recursive:
Fix
r
ename/re
n
ame(1to2) reso
l
ution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
merge-recursive: Introduce a merge_file
c
onvenien
c
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wr
e
n
merge-recu
r
sive: Fix modif
y
/delete resolutio
n
i
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
m
e
rg
e
-r
e
c
ursive: When we detect w
e
c
a
n
skip an
u
pda
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Provi
d
e mo
r
e
i
n
fo in co
n
flict
m
a
r
kers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Clea
n
up
and co
n
s
oli
d
ation
of rename_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recursive: Consolidate
pr
o
c
ess_ent
r
y
()
a
nd p
r
ocess_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-recur
s
ive: Improve
h
an
d
li
n
g of rename targ
e
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Add comments ab
o
ut handlin
g
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
me
r
g
e
-recursi
v
e: Make dead
c
ode for
r
e
n
ame/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-
r
ecursive:
Fix deletion of untracked file in
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-recursive: Split update
_
stages
_
a
n
d_entr
y
; only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
mer
g
e
-
recursi
v
e: Allow make_room_for_path() to remove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
m
e
r
ge-recursive: Split was
_
tracked() out of wou
l
d
_
lose_un
t
r
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
me
r
ge-r
e
c
ursive: Save
D/F con
f
l
i
ct filen
a
mes inste
a
d
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
li
j
a
h
Newren
merge-recursive:
Fix code chec
k
ing f
o
r D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecurs
i
ve: Fix s
o
rt
i
ng order and directory cha
n
ge
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
m
e
r
ge-r
e
cu
r
sive: Fix recu
r
s
i
v
e case with D/F co
n
fl
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
merge-recursive: Avoid working direc
t
o
r
y ch
a
nge
s
du
r
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
m
erge-r
e
cursive: Remembe
r
t
o
free gene
r
ate
d
unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recu
r
sive:
Consolidate dif
f
erent update_stag
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recurs
i
ve: Mark some diff_filespec struct ar
g
uments
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah N
e
wren
merge-recursive: Correct a c
o
mm
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-
r
ecursive: M
a
ke BUG mess
a
ge more legible b
y
addi
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022:
Add testca
s
e
for
m
erging a
renamed file
w
ith
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newre
n
t6022
:
New tests checking
for unnece
s
sary
u
pdates o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6022: Remove unnecessary
u
ntr
a
cked files
t
o mak
e
t
e
s
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t
6
03
6
: criss
-
cross + rename/rename(1t
o
2)/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t
6036: criss-cross w
/
r
e
name/rename(1to2)
/
modify+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
ah Newren
t
6036: tests f
o
r criss-cross merges with various director
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t
6036: criss-cross wi
t
h weird content can
fool git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6036:
Add differe
n
t
l
y resol
v
ed modify/delete c
o
nfl
i
ct
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add
f
a
iling testcases fo
r
rena
m
e/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
4
2:
Ensure rename/re
n
ame conflicts
le
a
ve index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Ne
w
ren
t60
4
2:
Ad
d
test
s
f
o
r content issu
e
s with
modify/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
e
wr
e
n
t6042: Add a testcase where
u
nd
e
t
e
cted
r
ename c
a
uses
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t60
4
2:
A
dd a pair
of cas
e
s where unde
t
e
cted r
e
na
m
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
ah Newr
e
n
t6042
:
Add fai
l
ing testcase for rename/mod
i
fy/add-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t
6
0
42: Add a tes
t
case where git de
l
et
e
s an untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elija
h
New
r
en
merge-rec
u
rsive
:
When w
e
detec
t
w
e
can skip a
n
u
p
date
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah Newren
t6022: New test check
i
ng for unnecessary upda
t
e
s
o
f
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
l
ijah Newre
n
t6
0
22:
N
e
w test checking for unnecess
a
ry update
s
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elij
a
h Newren
Add test
c
ases s
h
owing how pathspecs are
h
andled
w
i
th
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
E
lijah Newre
n
Make r
e
v-list --objec
t
s
work tog
e
ther with pathspe
c
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newre
n
Introduce sane_unset and use it to ensure prope
r
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lij
a
h Newren
t780
0
(di
f
ftool):
a
dd missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t7601 (merge-pu
l
l-config)
:
add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
N
e
wre
n
t7001 (mv): ad
d
missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t6016 (rev-list-g
r
ap
h
-si
m
p
lify-his
t
or
y
): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah New
r
en
t5602 (clone-remote-exec): add mi
s
sing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
r
e
n
t4
0
2
6
(color):
r
e
move
unneeded a
n
d unchained command
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t40
1
9 (dif
f
-ws
e
r
r
or)
:
add lots of
m
i
ssing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
t4202
(
log): Repla
c
e '<git-command> || :'
w
i
th test_might_fail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4002 (
d
iff-ba
s
ic): use test_might_fail
for
c
o
mma
n
ds
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elij
a
h
N
ewren
t100[12] (r
e
ad-tree-m-2way,
read_tree_m_u_2way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newr
e
n
t4017 (diff-
r
e
tval): replace manual
e
xi
t
code c
h
e
c
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Eli
j
ah Newren
t
3
020 (ls-
f
i
l
es-error-un
m
a
t
c
h): remove stray '1' fr
o
m
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newre
n
merge-recursive: R
e
m
o
ve
r
edun
d
ant pat
h
cle
a
ring
f
o
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
merge-
r
ecursi
v
e
: Ma
k
e room for
d
i
rectori
e
s in D/F
conf
l
icts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
handle_delete_modify(): Chec
k
wheth
e
r D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge_c
o
ntent(): Check whether D/F conflicts are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
co
n
flict_re
n
ame_ren
a
me_
1
to2():
F
i
x che
c
ks for
presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ij
a
h
Newren
c
onflict_rename
_
delete()
:
Ch
e
ck
wh
e
ther D/F c
o
nflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursiv
e
: Delay mo
d
i
f
y/delete conf
l
icts if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsive:
D
elay
conte
n
t
m
e
rging
f
or renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-recursive:
D
elay
h
andling of rename/d
e
lete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next