repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
doc: reword gitworkflows.txt for neutrality
2017-11-15
El
i
jah Newr
e
n
merge-rec
u
rsi
v
e: handl
e
addit
i
on
o
f
submodule on o
u
r
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Ne
w
ren
t
6044: new merge t
e
s
tcases for wh
e
n index
doesn't match
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newre
n
merge-octo
p
u
s:
a
bor
t
if in
d
ex d
o
es not
m
atch HEAD
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
bui
l
tin/merge
.
c: f
i
x a
b
u
g with
trivial mer
g
es
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah
Newren
t7605: add a
t
e
s
tcase dem
o
n
s
t
rati
n
g a
b
ug with
trivi
a
l
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elijah Newren
m
erge
-
re
c
ursive: do not
c
he
c
k
work
i
ng copy when cr
e
ating
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2016-04-13
Elija
h
New
r
e
n
me
r
ge-recursive: remove duplic
a
te code
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah N
e
wren
merge-re
c
ursive: Do
n
't
r
e-
s
ort a list
w
hose or
d
er
w
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewren
merge-recur
s
ive: Fix vir
t
u
al merg
e
base f
o
r rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
t6036: cr
i
s
s-cross + rename/
r
ena
m
e(1to2)
/
add-
d
est
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-
r
ecursive:
Avoid
unne
c
essary file rewrites
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newr
e
n
t
6022: Additional tests
che
c
king for unnecessary
u
p
d
a
t
es
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-
r
ecu
r
siv
e
: Fi
x
sp
u
rious 'ref
u
sing
to lose untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
e
n
t60
2
2: Add
t
e
s
tcase for spurious "refusi
n
g to
lose
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wre
n
mer
g
e-recursive
:
Fix
w
orking copy handling for
re
n
ame
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
e
n
merge-recursiv
e
: add handli
n
g
f
or ren
a
me
/
rename/add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
re
n
me
r
ge
-
recursive: Have conflict_renam
e
_delete r
e
use
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
me
r
ge-recursive:
Make mo
d
i
fy
/
d
elete handling code reusabl
e
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
me
r
ge-recu
r
sive: Consider m
o
difications in
r
en
a
m
e/rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merg
e
-re
c
ur
s
ive: Create function for merg
i
ng with bran
c
hname
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursive:
R
ecord more d
a
ta needed
for merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-re
c
ursiv
e
: Defer ren
a
me/rename(2
t
o
1)
h
a
ndling
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newr
e
n
merge-recursive: Small
c
lea
n
u
ps for conflict
_
rename_re
n
ame_1to2
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Fix rename/rename(1to2) resolution
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h
N
e
wren
m
e
rge-rec
u
r
s
ive: Introduce
a
merge_fil
e
convenie
n
ce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive:
F
ix mod
i
f
y/delete resolut
i
on i
n
the
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
ive: Whe
n
we d
e
tect we can skip an
update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merg
e
-r
e
c
u
rsive: Pr
o
vide more
i
nfo in c
o
nflict m
a
rkers
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah
N
ewren
m
e
rge-recu
r
sive:
C
leanup
and consolidation
o
f
rename_conflic
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-r
e
cur
s
ive:
Cons
o
li
d
at
e
process
_
entr
y
() and proc
e
ss_df_
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wre
n
merge-recursive
:
Improve handling of rename target
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-rec
u
r
s
i
v
e: Add comments a
b
out handling r
e
name
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge-re
c
ursive: Make dead code for rename/r
e
na
m
e(2t
o
1
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
ewren
merge
-
re
c
ur
s
ive: Fix de
l
et
i
on of untracked
file
i
n
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
Newr
e
n
m
erge-recursive: Split update_sta
g
es_and_en
t
ry; only
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
m
erge-re
c
u
rsi
v
e:
A
llow make_roo
m
_for_pa
t
h() to rem
o
ve
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge
-
recursive: S
p
lit was_track
e
d() out of would
_
lose_untr
a
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-recursive: Save
D
/F conflict filenames i
n
stead
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Newren
merg
e
-recursive: Fix code check
i
ng for D/F con
f
licts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merge-re
c
ursiv
e
: Fix sorting order
a
nd direc
t
or
y
c
han
g
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
m
e
rge-recursive: Fix recursive case with D/F con
f
lict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recursi
v
e: Avoid worki
n
g di
r
e
ctory
c
ha
n
ges during
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-re
c
u
r
s
ive
:
R
e
memb
e
r to free generated unique
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah
N
ewren
m
erge-
r
ecursive: Consolidate
differen
t
up
d
a
t
e_s
t
ages
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
mer
g
e-recu
r
sive
:
Mark so
m
e
diff_filespec struct argume
n
ts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursive: Correct a
comm
e
nt
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
r
ge-re
c
ursive: Make BUG
mess
a
ge more legible by adding
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
t6022:
A
dd tes
t
case for m
e
rging
a renamed
f
ile wi
t
h
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6022:
N
ew tests checking for u
n
necessary updat
e
s of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6022:
R
emove unnecessary un
t
rac
k
ed
f
il
e
s
t
o make t
e
st
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
36
:
criss-cross +
r
e
name
/
rename(1to2
)
/add-sourc
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6
0
36: criss-cros
s
w/ rena
m
e/rename(1to2)/mo
d
ify+rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6036: tests fo
r
criss-cro
s
s m
e
rge
s
with v
a
rious directory
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Newren
t6036: criss
-
cross with
w
eird
con
t
ent can fool git
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: Add differe
n
tly resolve
d
modify/del
e
te conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: A
d
d fail
i
ng tes
t
case
s
for
rename/rename
/
a
dd
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newr
e
n
t60
4
2: Ens
u
re rename/rename conflicts leave
i
n
d
ex and
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
042: Add tests for content issues with modify/rena
m
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6042: Add a tes
t
case
w
h
ere undetected rename causes
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t
6042: Add a pair of cases where undetected renames
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t60
4
2
:
Add fail
i
ng testc
a
se
for r
e
na
m
e/mo
d
ify/add-s
o
urce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
ah Newren
t6042:
Ad
d
a tes
t
case
w
here git de
l
ete
s
an untracked
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elij
a
h
N
ewren
merge-rec
u
r
sive
:
When we detect we c
a
n skip an update
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elijah
N
e
w
r
en
t6022: New test checking
f
or unn
e
cessary up
d
at
e
s of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-03-02
Elija
h
Ne
w
ren
t6022: New test
c
h
e
c
king for unne
c
essary upd
a
tes of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Elijah New
r
en
Add testcases showing how path
s
pe
c
s are handled with
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2011-02-03
Eli
j
ah Newren
Make rev-lis
t
--objects work together with pathspecs
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newr
e
n
Introd
u
ce sane_unset and use it to ensure proper
&
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
lijah Newren
t78
0
0 (difftool): add
m
issing
&
&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah New
r
en
t7601 (merge-pull-config): a
d
d mi
s
s
i
ng &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah
N
ewren
t700
1
(mv)
:
add miss
i
ng &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elija
h
Newren
t601
6
(rev-list-
g
r
a
ph-si
m
p
l
i
f
y-
h
is
t
o
ry): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Newren
t5602 (clone-remote-exec): add missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah N
e
wre
n
t
40
2
6 (color): remove unn
e
eded an
d
u
nchai
n
ed comman
d
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah Ne
w
re
n
t4019 (diff-wserror): ad
d
lo
t
s of missing &&
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
El
i
jah Newren
t4202 (log):
R
eplace '<git-co
m
man
d
> ||
:
' with test_mi
g
ht_
f
ail
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
E
l
ijah Newren
t4002 (diff-basi
c
): use test_mi
g
ht_f
a
il fo
r
co
m
mands
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Elijah New
r
en
t100[12] (r
e
ad-
t
ree
-
m
-2way,
r
ead_tree_m_
u
_2way)
:
add
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-06
Eli
j
ah Newren
t4017 (diff-
r
etval)
:
r
epla
c
e manual ex
i
t code check
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-10-04
Elij
a
h Newren
t
3
02
0
(l
s
-
files-err
o
r-unmat
c
h):
remove stray
'1' from
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
me
r
g
e-rec
u
rsive: Remove redundant
p
ath c
l
ea
r
ing for
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewre
n
merg
e
-rec
u
rs
i
ve: Make
roo
m
for directories in D/F c
o
nflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
hand
l
e_delete_modify(): Che
c
k whet
h
er
D
/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merge_content():
C
heck w
h
ether
D
/F conflicts
a
re
s
till
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
e
n
conflict_rename_ren
a
me_
1
to2(): Fix ch
e
cks for
p
rese
n
ce
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah New
r
en
conflict_rename
_
d
e
lete(): Check w
h
et
h
er D/F conflicts
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
wren
merge-recu
r
s
i
ve:
D
e
l
ay
modify
/
de
l
ete conf
l
icts
i
f D
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Ne
w
ren
m
e
r
ge-recursive:
D
elay content merging for r
e
names
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
mer
g
e
-
recursive
:
D
elay han
d
ling of rena
m
e
/delete conflicts
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h New
r
en
merge-recursive:
M
ove handling of double rename
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-recursive: M
o
ve handling of double rena
m
e
of
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
m
e
rge
-
recursive: Avoid doubly mergi
n
g rename/add conflict
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merge-recursive: Update merge_content() ca
l
l
signature
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newr
e
n
merge-recursive: Update c
o
nflict
_
ren
a
me
_
r
e
nam
e
_1to
2
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: S
t
ructure
p
ro
c
es
s
_df_entry() to han
d
l
e
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
merg
e
-
r
ecu
r
s
i
ve: Have process_en
t
ry()
s
kip D/F o
r
rename
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive:
New
f
u
n
ction to assist r
e
sol
v
ing renam
e
s
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
ja
h
Newren
merge
-
re
c
ursive
:
New
da
t
a structures for de
f
erring
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Move proce
s
s_
e
ntry'
s
con
t
ent merging
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
a
h
New
r
en
merge-recursive: Move delete/m
o
dify handl
i
ng into dedicated
.
.
.
Signed-off-by:
Elijah Newren
<newren@gmail.com>
commit
|
commitdiff
|
tree
next