repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xwrite: poll on non-blocking FDs
2015-12-10
Christian Cou
d
er
Doc
u
mentation/
g
it-up
d
ate-index: add missing
o
p
ts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-11-24
Christian Co
u
der
Documentation/git-updat
e
-index: add missin
g
opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Christian Coude
r
quote: move comment be
f
ore sq_quote
_
b
uf()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Christi
a
n C
o
uder
quote: fix broken
s
q_quote_buf() rel
a
ted co
m
ment
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-08-31
Christian Co
u
d
er
trailer: supp
o
rt multiline titl
e
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-26
Chr
i
s
t
ian Couder
trailer
:
retitle a tes
t
and c
o
rrect
a
n
i
n
-
comme
n
t mes
s
age
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-21
Christian Cou
d
er
trail
e
r:
i
g
n
ore first line of message
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Ch
r
ist
i
a
n
Couder
bisect: add te
s
t to check that
r
e
v
s
are pro
p
erly parsed
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Christian Couder
bisect: parse revs
b
e
fore
passing t
h
e
m
to ch
e
ck_expect
e
d_revs()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
trai
l
er: add test wit
h
an
o
ld style conflict block
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Ch
r
istian Couder
trailer: reuse ignore
_
n
on_trailer() t
o
ignore
c
onflict
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
commit: make ig
n
o
re_n
o
n_trail
e
r
() non
s
tati
c
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
tr
a
il
e
r
:
d
isplay a trail
e
r without its trailing newline
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
tra
i
le
r
: ignore comment lines inside the trailers
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Couder
Documentation: add docum
e
ntation for
'
g
i
t interpret
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian Couder
trailer: a
d
d
t
e
sts
for
c
ommands in conf
i
g file
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian
C
o
u
d
er
tr
a
iler: execute comma
n
d
from 'trailer
.
<name>
.
comman
d
'
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
i
a
n Coude
r
trailer: add
t
e
s
ts
fo
r
"
g
i
t
interpret-trailers"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
ist
i
an Coud
e
r
trailer: add inter
p
ret-tr
a
i
l
ers command
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
s
t
ian Couder
trailer: p
u
t all the proces
s
ing to
g
ether and print
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
t
i
a
n
Couder
tra
i
ler: parse trai
l
e
rs
f
rom
fi
l
e or stdin
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Co
u
der
tr
a
i
l
e
r
:
p
r
o
c
ess command line trail
e
r a
r
gum
e
nts
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Co
u
der
trailer: read
a
n
d process config infor
m
ation
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n
Couder
tr
a
iler:
process t
r
ailers from
input message
a
n
d
arguments
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Couder
t
r
aile
r
:
a
dd data str
u
ctures
and basic functions
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christi
a
n Couder
replac
e
:
a
dd te
s
t for --graft wit
h
a mer
g
etag
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Ch
r
istian Couder
re
p
lace: check mergetags whe
n
using
-
-
graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Chr
i
s
t
ian Coude
r
rep
l
ace: add
t
est
f
or
-
-
gra
f
t wit
h
signed
c
o
m
mit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christia
n
C
o
uder
replace: r
e
move
signature when using --graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Chri
s
tian Couder
contri
b
: add conv
e
rt-grafts-to-replace-re
f
s
.
sh
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian
Couder
Docume
n
tat
i
o
n
: replace
:
add --gra
f
t o
p
tion
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
replace
:
a
dd test
for --gr
a
ft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
hri
s
tia
n
C
ouder
replace
:
add
-
-graft option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
C
h
r
i
stian
Couder
repl
a
ce: cleanup redi
r
ection s
t
yle in tests
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
C
hristian Cou
d
er
commit:
a
dd for_each_mergetag()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
Docu
m
en
t
ation: r
e
place:
describe new --edit opt
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Chri
s
tian Couder
r
e
place: add -
-
edit to usage stri
n
g
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christia
n
Couder
replace: add
t
es
t
s for -
-
edit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
repla
c
e: die early
i
f
rep
l
ace
r
ef already ex
i
sts
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Ch
r
ist
i
an
C
o
uder
repla
c
e: refact
o
r checki
n
g ref
validity
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
r
e
p
lace
:
m
a
ke sure -
-
edit results in a dif
f
er
e
nt obje
c
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-30
C
hristian C
o
uder
replace info: rename
'full' to 'long' an
d
cla
r
ify
i
n
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Ch
r
i
sti
a
n
C
ouder
Documentatio
n
/git-replace:
d
escribe --format opti
o
n
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian
Couder
builtin/replac
e
: unset
r
ead_repl
a
ce_refs
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
t
6
050:
a
d
d
t
e
s
t
s for
listing
with -
-
format
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christia
n
C
o
uder
builti
n
/replac
e
:
t
each l
i
sting us
i
ng short, medium
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chr
i
stian Co
u
d
e
r
sha1_file
:
perf
o
rm
object replacement in sha1
_
object
_
info_ex
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ristia
n
Couder
t6050: s
h
ow th
a
t git c
a
t-fi
l
e --ba
t
ch fails
w
ith replace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chris
t
ian Couder
sh
a
1
_object_info_exten
d
e
d
(): add a
n
"unsigned flags
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Ch
r
istian Couder
sha1
_
file
.
c: add lookup_replace_obje
c
t_extende
d
() t
o
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian
C
o
u
d
er
replace_object: don't check read_replace
_
refs twice
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian
Cou
d
er
renam
e
READ_SH
A
1
_
FILE_R
E
PL
A
C
E flag to LOOKUP
_
REPLA
C
E_
O
BJECT
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Chr
i
stian Cou
d
er
s
t
rbuf
:
remove prefixcmp() and suf
f
ixcmp()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
C
hristian Couder
replace {pre,suf}fixcmp() with {start
s
,ends}_with()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Ch
r
i
s
tian
C
o
u
der
strbu
f
: intro
d
uce st
a
rts_w
i
th() and ends_with()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Co
u
der
b
u
iltin/rem
o
t
e: remove po
s
tfixcmp() and
u
se suffixcmp
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Chr
i
stian
C
ouder
e
n
vi
r
onm
e
nt: nor
m
alize use of pre
f
ixcmp() by removing
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-10-28
Christ
i
an
C
ouder
sha1_file:
m
ove
comment
about return value whe
r
e it
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Ch
r
istian Couder
t6050-r
e
p
l
a
c
e
: use som
e
long option names
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chris
t
i
a
n Couder
r
eplace
:
allow long op
t
io
n
names
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
h
r
istian Couder
D
ocumentation/replace:
add
Creating Replaceme
n
t O
b
j
e
cts
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian C
o
uder
t6
0
50-replac
e
: add test to cl
e
an up
al
l
the re
p
lace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
hristian Co
u
der
t
6050-replace: tes
t
that objects are of
the sam
e
t
ype
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chr
i
stian Couder
Docum
e
n
t
ation/
r
eplac
e
: state
that objects
m
u
s
t be of
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
repl
a
ce: forbid rep
l
a
c
i
ng an
object
w
ith one of a d
i
fferent
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-30
Chri
s
tian Couder
gitk
:
Ig
n
ore
g
itk-wish bu
i
ldproduct
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-10
Christian Couder
Makefile: detect
w
h
e
n
P
Y
THON
_
P
A
TH c
h
ang
e
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-25
Christian Couder
Makefile: repl
a
c
e
"echo
1
>
.
.
.
"
w
i
th "ec
h
o
>
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
Chris
t
ian
C
ouder
Makefile: re
p
l
a
ce
"
e
c
ho 1>
.
.
.
" with "echo >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
C
hristi
a
n
Couder
Makef
i
l
e
: det
e
ct
when PYTHO
N
_
PAT
H
chan
g
e
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-18
C
h
ri
s
tian Co
u
der
Makefile
:
re
m
ove tracking of TCLTK_PAT
H
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-04-22
Chris
t
ian Couder
r
e
vert: add
m
iss
i
ng va_end
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2011-09-21
Christian Couder
bis
e
ct
:
fix
e
x
i
ting wh
e
n checkout fail
e
d i
n
bise
c
t_st
a
rt(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-09-27
Christian
C
ouder
t
6
050
(
replace): fix bogus "fetch bran
c
h
with replac
e
men
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christ
i
a
n C
o
u
d
er
blame: use fi
n
d_commit_s
u
bject() inst
e
ad of cus
t
om
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian
Couder
merge-recursi
v
e:
u
se find_comm
i
t_su
b
ject() in
s
tead
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christi
a
n Coud
e
r
bisect: u
s
e find_com
m
it_subj
e
c
t
() instead of custom
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Ch
r
istian Cou
d
er
re
v
ert: rename v
a
riabl
e
s related to subject
i
n ge
t
_message()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Ch
r
i
stian
Couder
re
v
ert: refactor c
o
de to find commit s
u
bject in f
i
nd_commit_
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
C
h
ristian Co
u
der
revert: fix off by one read when se
a
r
c
hing the
e
nd
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Ch
r
i
s
ti
a
n Couder
t350
8
: ad
d
check
_
he
a
d_differs_from(
)
he
l
pe
r
f
u
ncti
o
n
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
C
h
r
i
stian Couder
revert: improve success m
e
ss
a
ge by a
d
din
g
a
b
bre
v
iated
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Chris
t
ian Couder
revert: don't print "Finished o
n
e
c
herry-pick
.
"
if
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Chri
s
t
i
a
n
C
ou
d
er
reve
r
t: refactor commit c
o
de
i
n
t
o a new run_git_
c
o
mmit
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian Couder
re
v
ert: report success
whe
n
u
sin
g
option --st
r
ategy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Chri
s
tian Couder
Doc
u
m
en
t
ation:
grep: fix asciidoc problem with --
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Christ
i
a
n
C
ouder
revert: ac
c
ept arbitrary rev-
l
i
st
options
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-13
Christian Couder
comm
i
t: us
e
valu
e
of
GIT_R
E
FLOG_AC
T
ION env variable
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-06
Chris
t
i
an Cou
d
er
diff: fix "git show -C -C" output when renamin
g
a binary
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Chri
s
ti
a
n Couder
Documentation/revert: d
e
scribe passing more th
a
n one
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Chri
s
tia
n
C
ouder
Do
c
ument
a
tio
n
/cherry-pick: des
c
ribe pa
s
sin
g
more tha
n
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Ch
r
istian Couder
revert:
a
d
d tests to check che
r
ry-
p
ic
k
i
ng ma
n
y
c
om
m
its
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
hris
t
i
an Co
u
der
revert:
allow cher
r
y-picking more th
a
n one commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Chr
i
stian Coude
r
r
e
ve
r
t: change h
e
l
p_msg() to
t
a
k
e no ar
g
u
ment
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christia
n
Coude
r
revert: refactor
code i
n
to a do_pick
_
commit(
)
f
u
nction
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian C
o
u
d
er
revert
:
use run_command_
v
_opt(
)
instea
d
of exe
c
v_git_
c
md()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Chri
s
tian Couder
revert: c
l
eanup co
d
e
f
o
r -x option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Chris
t
ia
n
Cou
d
er
r
e
vert: a
d
d "--strat
e
gy" opt
i
on to choos
e
merge str
a
tegy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Chris
t
ian Couder
merge
:
make
functi
o
n
t
ry_merge_comman
d
non static
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christian
C
o
uder
merge
:
refacto
r
cod
e
that calls "git
merge-
S
TRAT
E
GY"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
next