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
worktree: say that "add" takes an arbitrary commit in short-help
2017-12-05
El
i
jah Newre
n
s
t
rb
u
f: r
e
mo
v
e unuse
d
st
r
ips
p
ac
e
f
uncti
o
n alias
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-27
Elijah
N
ewren
mer
g
e-recur
s
ive:
i
gnor
e
_
case shou
l
d
n
't rej
e
ct intentional
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newre
n
sequencer: show rename progress during cher
r
y
picks
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah
N
ewren
diff
:
remo
v
e s
i
lent cl
a
mp of renameLimit
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Elijah New
r
en
progress: f
i
x progre
s
s meters w
h
e
n
d
ea
l
ing with l
o
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-15
Eli
j
ah
N
ewren
merge-recursive: ha
n
dle addition of sub
m
od
u
le on our
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2017-11-14
Elijah N
e
wren
sequencer: warn when int
e
rnal merge
may
be sub
o
ptimal
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
N
e
w
r
en
t6044:
n
ew merg
e
t
e
st
c
a
s
es
for when index do
e
sn't
match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah N
e
w
r
e
n
merge-octopus: abort if index
d
oes not match H
E
AD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newre
n
builtin/merge
.
c: fix a bug wit
h
trivial
m
erges
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
t
7605: add a testcase demonstr
a
ting a
b
ug with t
r
ivial
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elij
a
h Newren
merge-recursive:
d
o
not check
w
orki
n
g co
p
y
w
he
n
creating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
El
i
jah Newren
merg
e
-recursive:
r
emove
d
u
pl
i
cate
code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-recursive: Do
n
'
t
r
e-
s
ort
a lis
t
wh
o
se order we
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
New
r
en
m
er
g
e-recur
s
ive:
Fix virt
u
al merge base for rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: cri
s
s-cross + rename/rename(
1
t
o
2
)/add-dest
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah N
e
wren
merge-r
e
cursive: Avoid
unnecessar
y
file
rewr
i
tes
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6
0
2
2
:
Additional tests checki
n
g
for unnecessary u
p
dates
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
mer
g
e
-recursive: Fix
s
pu
r
ious 'refusing to l
o
se untra
c
ked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
N
ewren
t6
0
22: Add testcase f
o
r spurious "refusing to lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
New
r
en
merge-rec
u
rsive: Fix
working
c
o
p
y handlin
g
fo
r
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recursive: add handling for rename/
r
ename
/
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-
r
ecursiv
e
: Have c
o
nflict_re
n
am
e
_delete re
u
se
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h
N
ewren
merge-re
c
ursive: Ma
k
e modify/
d
elete handli
n
g code reusable
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
merge
-
recurs
i
ve: Consider modifi
c
a
tions
i
n rename/ren
a
me
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Ne
w
ren
merge-recursive
:
C
r
eate function for m
e
rging with bran
c
hname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-
r
e
cursive: Record more data nee
d
ed
for
m
er
g
ing
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recurs
i
ve:
D
efer rename/rename
(
2to1) handl
i
ng
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recurs
i
ve: Sma
l
l cle
a
nups for co
n
flict_re
n
ame_rename_1t
o
2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
e
wren
merge
-
recursive
:
Fix rena
m
e/
r
ename(1to
2
)
resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-recursive: Introdu
c
e a m
e
rge_file con
v
enie
n
ce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
e
wren
merg
e
-
recursive: Fix modify/d
e
let
e
resolutio
n
i
n th
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-
r
e
c
ursive: When we detect
we
can sk
i
p
a
n upda
t
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-
r
ecursive: P
r
ovide more i
n
f
o
in confl
i
ct mar
k
ers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
me
r
ge-r
e
cursiv
e
: Cleanup
and consolidation of re
n
ame_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Consolidate process_entry()
a
n
d
pro
c
ess_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
me
r
g
e
-recursive: Improve ha
n
dling of rena
m
e target
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
r
en
merge
-
recu
r
sive: Add commen
t
s abou
t
handling r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Ne
w
ren
merge-recur
s
ive: Make dead code for
rename/rename(2to1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h Newren
mer
g
e
-recu
r
sive:
Fix deletion of untr
a
cked file
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newre
n
merge-recu
r
s
ive:
Sp
l
it update_stage
s
_and_entr
y
; only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
m
e
rge-recursive: Allo
w
ma
k
e_room_
f
or_path
(
) to
remove
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
e
r
g
e
-re
c
ursive: Split
w
as
_
tracked() out of would
_
lose_untra
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
mer
g
e-recu
r
sive: Save D/F confl
i
ct filenames instead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-recursiv
e
:
Fix code checking for D/F confl
i
ct
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recurs
i
ve: Fix sorting order
a
nd directo
r
y
change
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
me
r
ge-recursive: Fix r
e
cursive
c
a
se with D/F
conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
c
u
rsiv
e
:
Avoid worki
n
g directory cha
n
ges duri
n
g
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: R
e
mem
b
e
r
to free g
e
nerate
d
uni
q
ue
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
mer
g
e-recursiv
e
: Consoli
d
ate different upda
t
e
_
stages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newre
n
merge-recursi
v
e: Mark some diff_
f
ilespec stru
c
t argum
e
nts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recu
r
si
v
e: Cor
r
ec
t
a comment
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newren
mer
g
e-recursiv
e
: Make BUG mes
s
ag
e
more legible
b
y adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Ne
w
ren
t6022: Add testcase for merging
a renam
e
d f
i
le with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6022: New
t
ests checking for unnece
s
sary updates
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6022: Remove unnecessary un
t
racked f
i
les to mak
e
test
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
t6
0
36: cri
s
s-cros
s
+ rename/re
n
ame(1to2)/
a
dd-source
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
t
6
036:
c
riss-
c
ross w/ rena
m
e/rename(1to2
)
/modify+
r
ena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
en
t603
6
: test
s
for c
r
iss-c
r
oss merge
s
with various director
y
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
036: cris
s
-c
r
oss
w
ith we
i
rd c
o
nt
e
nt can foo
l
git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: Add dif
f
erently res
o
l
ved modify/delete
confl
i
c
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t60
4
2: A
d
d f
a
iling testc
a
ses for r
e
name/rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Ensur
e
rena
m
e/ren
a
m
e c
o
n
f
licts
leave index and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6042: Add tes
t
s for content issues wit
h
modify/
r
ename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6042: Add a testcase where
undetected rename causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newr
e
n
t6042:
A
dd a pai
r
of cases where undetec
t
ed renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6042: Add failing testcase for r
e
name/modi
f
y/a
d
d-s
o
urce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newr
e
n
t6042:
A
d
d
a testca
s
e
w
h
ere git deletes an un
t
rac
k
ed
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
E
lijah Ne
w
ren
merge-re
c
ur
s
iv
e
: When we d
e
tect we ca
n
skip an
update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elij
a
h Newren
t6022: New t
e
st checking
f
o
r
unnece
s
s
a
ry updat
e
s of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah
Newr
e
n
t6022: N
e
w
tes
t
checki
n
g fo
r
un
n
e
cessary
u
p
dates of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elija
h
Newren
A
dd
testcase
s
s
howing how
p
athspecs are handled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah
N
e
w
re
n
Ma
k
e rev-li
s
t --o
b
jects w
o
rk together with
pathspec
s
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
re
n
Introduce sane_u
n
s
et and
use it to ensure proper &
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ija
h
New
r
en
t7800 (d
i
fftool)
:
add
missing &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t
7
601 (merge-pu
l
l-config
)
: add missin
g
&&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
Newr
e
n
t7001 (mv): a
d
d
m
i
ssing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t6016 (rev-list-graph-simpli
f
y
-his
t
ory): add
m
i
ssing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newre
n
t560
2
(cl
o
ne-remote-ex
e
c): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
a
h
Newren
t4026 (co
l
o
r): remo
v
e unneeded a
n
d unchained comma
n
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah New
r
en
t
4
019 (diff-wserro
r
): add lo
t
s of missing &
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4202
(
log):
R
eplace
'<git-co
m
mand> ||
:
' wit
h
test_might_fa
i
l
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t4002
(diff-ba
s
ic): use
test_
m
ight_
f
a
i
l for comm
a
nds
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t100[12]
(read-tree-m-2w
a
y,
read
_
tre
e
_m_u
_
2way): add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t4017 (diff
-
retval): rep
l
ace manual exi
t
co
d
e chec
k
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Eli
j
a
h
N
e
wren
t3020 (ls
-
files
-
e
r
r
or-unmat
c
h): remove stray
'
1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newre
n
merge-rec
u
rs
i
v
e
: Rem
o
ve redund
a
nt path clearing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newre
n
merg
e
-recu
r
sive: Ma
k
e ro
o
m
f
or directories in D/F conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
handle_delete_m
o
d
i
fy():
C
heck whether D/F confl
i
cts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge_content
(
): Check whether D/F
c
on
f
licts are still
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
j
a
h N
e
w
r
en
conflict
_
rename_rename_1to2(): Fi
x
chec
k
s fo
r
presence
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
conflict_rename_de
l
ete():
C
he
c
k whethe
r
D
/F c
o
nflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
ren
merg
e
-re
c
u
r
sive: Delay modify/delete conflict
s
if D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewre
n
merge-re
c
ursive: Delay content merging f
o
r renames
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah
N
ewren
merge-recursive: Delay handl
i
ng of rename/del
e
te con
f
licts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newre
n
merge-
r
ecursive:
Mo
v
e
handling of double r
e
name of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-recursive: Move h
a
n
dli
n
g of
d
ouble r
e
name of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah N
e
wren
merge-recursive: A
v
oid doubly m
e
rging ren
a
me/add conflic
t
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
merge-
r
ecu
r
sive:
Update merge_content() call signatu
r
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
r
en
merge-recursive: Update conf
l
ict_r
e
n
a
me_rename_
1
to2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next