repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
config: add 'origin_type' to config_source struct
2015-12-10
Ch
r
istian Coud
e
r
Documentation/g
i
t-update-index: add
m
issing opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-11-24
C
hrist
i
an Couder
D
o
cumenta
t
ion/git-update-inde
x
: add missing o
p
ts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Christian Coud
e
r
q
u
ote:
m
ove comment before
s
q_q
u
ote_buf()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Chris
t
i
a
n Couder
quote: fix broken s
q
_quote
_
buf() related comment
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-08-31
C
h
ristian Couder
tra
i
l
e
r:
s
u
p
port
m
ultiline title
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-26
Christia
n
Couder
trail
e
r: retit
l
e a t
e
st and c
o
r
r
ect
an in-comme
n
t message
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-21
Christi
a
n Couder
trailer: ignore first
l
ine of message
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
C
h
ristian C
o
uder
b
isect
:
add
test to
c
heck that re
v
s are
p
roperly parsed
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Christi
a
n Couder
bisect: parse revs before p
a
ssi
n
g them to c
h
eck_
e
xpected
_
revs()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
C
hristia
n
Co
u
der
trai
l
er: add
t
est
w
ith an old style
conflic
t
block
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
C
h
ris
t
ian C
o
uder
t
r
ailer:
r
euse
i
gno
r
e_non
_
trailer() to ignor
e
conflict
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
commi
t
: make
i
gnor
e
_non
_
trailer() non stati
c
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christia
n
Couder
trailer: disp
l
a
y
a trailer wi
t
hout it
s
tr
a
iling new
l
ine
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christ
i
an Couder
trail
e
r: ignore
com
m
e
n
t lines inside
the trail
e
rs
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n Couder
Documenta
t
i
on
:
add
docu
m
entation for 'git
in
t
erpret
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristian Couder
trailer:
a
d
d tests f
o
r
co
m
man
d
s
in c
o
n
fig file
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trai
l
er:
e
x
e
cute comman
d
from 'trailer
.
<
n
am
e
>
.
command
'
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
u
de
r
traile
r
: a
d
d tes
t
s for "git interp
r
et-trailers"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an
C
o
u
der
tra
i
l
er: add in
t
e
r
pret-tr
a
i
l
ers co
m
m
and
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Co
u
der
trailer
:
put al
l
the
p
roce
s
sing
toget
h
er and print
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Cou
d
er
trailer: parse tr
a
ilers f
r
om
f
ile or stdin
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
hristian C
o
uder
tra
i
ler: process command l
i
ne
t
railer arguments
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
uder
trailer: read a
n
d
pr
o
cess conf
i
g i
n
f
o
rmation
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n C
o
uder
tr
a
i
l
er: process tr
a
i
le
r
s
f
rom input message and ar
g
uments
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian
C
oude
r
t
railer: add data structures and basic fu
n
cti
o
ns
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
re
p
l
a
c
e: add te
s
t f
o
r
--gra
f
t with a
m
ergetag
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
r
e
place: che
c
k me
r
getags w
h
en u
s
i
ng --graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christi
a
n Cou
d
e
r
replac
e
:
add te
s
t for
--graft with signed commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
replace: remove
s
ignature whe
n
using --graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
contrib:
a
dd convert-g
r
afts-to-re
p
lace-
r
ef
s
.
sh
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
hri
s
tian Couder
Docu
m
entati
o
n: repl
a
ce: add --gr
a
ft
o
pti
o
n
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Ch
r
istian C
o
u
d
er
replace: a
d
d test for --graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian
Coud
e
r
re
p
lace:
add
--graft o
p
t
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Christian Coude
r
replace:
c
leanup redirection style in te
s
t
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Chris
t
i
a
n Couder
com
m
it: add for_each_mergetag(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christia
n
Couder
Docu
m
entation
:
rep
l
ace:
describe n
e
w --edit option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
C
hristian Co
u
der
replace: add --edit to usage string
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christi
a
n Couder
repl
a
ce: add tests for
--e
d
it
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
rep
l
ace: d
i
e early
i
f
r
e
p
l
ace ref already exists
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Chri
s
tian
C
ouder
repl
a
ce: refactor
c
hecking ref validity
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Chris
t
i
a
n Coude
r
replace:
m
ake sure
-
-edit
results in a dif
f
eren
t
object
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-30
Chri
s
tian Couder
r
e
place info: rename 'full' to 'long' and c
l
arify in
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christia
n
Couder
D
o
cumentation/git
-
replace: descr
i
b
e -
-
format option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ristian Couder
builtin/r
e
place:
u
nset
r
ead_replace_refs
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
hristian
C
o
uder
t6050
:
add t
e
sts for
l
ist
i
ng
w
ith --fo
r
m
a
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Coude
r
b
uiltin
/
r
eplace: te
a
ch lis
t
in
g
usi
n
g
sho
r
t, med
i
um
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chris
t
ian Couder
s
h
a
1
_
f
ile:
p
erf
o
rm object r
e
place
m
ent in sha1_object_
i
nfo_ex
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chris
t
ian Couder
t60
5
0
: show
t
h
a
t git c
a
t
-
f
i
le --batch f
a
il
s
with replace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ris
t
ian C
o
uder
sha1_object_in
f
o
_
e
xten
d
ed():
a
dd an
"
uns
i
gne
d
fl
a
gs
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
sha1_file
.
c: add lookup_
r
eplace_
o
bject_extended() to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
r
eplace_o
b
jec
t
: don't check read_replace_refs twice
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian
C
ouder
ren
a
me READ_SHA1_FILE_
R
EPL
A
C
E flag to L
O
OK
U
P_REPLACE_
O
BJE
C
T
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christia
n
C
o
uder
st
r
buf: r
e
move prefixcmp(
)
and su
f
fixc
m
p()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Ch
r
istian C
o
uder
repla
c
e {pre,s
u
f}fi
x
cmp() with {start
s
,ends}_with()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian C
o
uder
strbuf: introduce starts_wi
t
h
(
) and ends_w
i
t
h()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian C
o
ude
r
builti
n
/remote: r
e
move p
o
stf
i
xcmp() and use suffixcm
p
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Chris
t
i
a
n
C
o
u
der
environment: normalize use of prefixcmp() by re
m
o
v
ing
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-10-28
Christian Couder
sha1
_
file: move co
m
me
n
t about return value where
i
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
h
r
i
stian Couder
t6050-r
e
pl
a
ce: us
e
some long option names
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian C
o
u
d
e
r
repl
a
c
e
:
a
llow long option n
a
mes
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
h
rist
i
a
n
Couder
Documentat
i
o
n/repla
c
e: add Creating
Replacement
O
bj
e
cts
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
hristian Couder
t605
0
-
re
p
lace
:
add t
e
st to
cl
e
an u
p
a
ll the
r
e
p
lace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
hristian
C
ou
d
er
t
6050-replace: test that object
s
a
r
e of
the
same ty
p
e
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chr
i
s
tian Co
u
der
Do
c
u
m
ent
a
tion/r
e
place: st
a
te that ob
j
ects
m
ust be
o
f
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chris
t
ian Couder
r
epla
c
e: fo
r
bid replacing an object wit
h
o
n
e
of a differ
e
n
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-30
Christian C
o
u
d
er
gitk:
Igno
r
e gi
t
k-wi
s
h
b
uildp
r
odu
c
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-10
Christian Coud
e
r
Ma
k
e
file
:
detect when PYT
H
ON_PATH
changes
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-25
C
hristian Couder
Ma
k
e
f
ile: replace "echo
1>
.
.
.
" with "
e
cho >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
Christian
Couder
Makefil
e
: rep
l
ace "echo 1>
.
.
.
" w
i
th "echo >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
C
h
r
istian Couder
Makefile: detect w
h
e
n PYTHON_PATH chang
e
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-18
Chris
t
ian Couder
Makefile: r
e
m
o
ve track
i
ng of TCLTK_PATH
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-04-22
C
h
r
istia
n
Couder
revert: add missing va_e
n
d
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2011-09-21
Christia
n
Couder
b
isect: fix ex
i
ting when checkout failed i
n
bisect_start()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-09-27
C
hristian Co
u
der
t60
5
0
(
replac
e
):
f
ix bogus
"f
e
tc
h
branch with replacement
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
blame: use f
i
nd_comm
i
t_subject() instead
o
f custom
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Chri
s
tian Co
u
der
me
r
ge-rec
u
rs
i
ve: use find_commit_subj
e
c
t
() instead
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
C
hristian
C
oud
e
r
bise
c
t: use find_commit_subject
(
) i
n
stea
d
of custom
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Coud
e
r
rever
t
: rename
variabl
e
s
related to s
u
bje
c
t in
g
et_
m
essa
g
e
()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Chri
s
tian
C
ouder
rever
t
: refa
c
tor code
t
o
f
ind commi
t
su
b
j
ect in find_commit_
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christ
i
an C
o
u
d
er
revert: fix off by one read when searchin
g
the end
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
C
h
r
istia
n
Couder
t35
0
8:
a
dd
c
h
e
c
k_head_diffe
r
s_from() helper functio
n
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian C
o
uder
revert: improve s
u
ccess mes
s
a
g
e by a
d
ding a
b
breviated
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christi
a
n Couder
r
e
ver
t
:
don't p
r
in
t
"Fi
n
ished on
e
cher
r
y-pick
.
" if
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian
Couder
reve
r
t: r
e
factor
commit
code int
o
a new run_git_commit
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian
Coude
r
revert: report su
c
c
e
ss when using
o
p
tion --stra
t
egy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Christian
Cou
d
er
Documentation: gr
e
p: fix asciidoc problem
w
ith -
-
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Christian Couder
rev
e
rt
:
accept arb
i
tra
r
y re
v
-
list options
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-13
Chri
s
tian Couder
commit: use value
o
f GI
T
_REFLOG
_
ACTION en
v
v
ariable
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-06
C
hrist
i
a
n
Co
u
der
dif
f
:
fix "
g
it
s
how -C -C"
outpu
t
when renamin
g
a binary
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christia
n
Couder
Documentation/rever
t
: describ
e
passi
n
g
more than
o
ne
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christ
i
an Coude
r
Documentatio
n
/cherr
y
-pick: describe pa
s
sing more than
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Ch
r
i
s
tian Cou
d
er
revert:
add tests
t
o chec
k
cherry-picki
n
g man
y
co
m
mits
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Coud
e
r
r
e
vert:
a
l
l
ow che
r
r
y
-picking more than one commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
hristian Couder
revert: change help_msg() to take no argument
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
hristian Coude
r
revert: refactor code
i
n
t
o a do_pi
c
k_
c
o
mmit()
f
u
nction
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
h
ristian Couder
revert
:
u
s
e
run_comma
n
d_v_opt() inste
a
d
o
f exe
c
v_g
i
t_cmd()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Ch
r
istian Cou
d
er
r
e
ve
r
t
:
cle
a
nup code for -x
o
p
tion
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christian Couder
rever
t
: add
"
--strategy" o
p
tion to choose me
r
ge strategy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christi
a
n C
o
uder
me
r
ge: mak
e
fu
n
ction t
r
y_merge_comm
a
nd non sta
t
ic
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Ch
r
istian
C
ouder
merge:
r
efactor code that calls "gi
t
merge
-
ST
R
ATEGY"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
next