repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
sane_grep: pass "-a" if grep accepts it
2015-12-10
Christia
n
C
o
u
d
e
r
Do
c
u
m
entat
i
o
n
/git-up
d
ate-inde
x
: add mi
s
sing opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-11-24
C
h
ri
s
t
ian Couder
Documentation
/
git-update-index: add missing opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Christian Couder
quo
t
e: move com
m
ent
before sq_quote_buf()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Chr
i
s
tian Coude
r
quo
t
e: fix br
o
ken sq_qu
o
te_buf() related
comment
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-08-31
Christian
Couder
trailer: s
u
p
p
ort multiline title
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-26
Chri
s
tian Cou
d
er
tra
i
ler: ret
i
tle a
t
est
a
nd corre
c
t an in-co
m
ment
m
e
ssage
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-21
C
hristian Couder
tr
a
iler
:
ig
n
ore first line of messag
e
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
C
hr
i
st
i
an C
o
uder
bis
e
ct: add test to che
c
k that revs are properl
y
parsed
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Christian Couder
bisec
t
:
parse rev
s
b
e
fore p
a
ssing them to ch
e
c
k
_expecte
d
_
revs(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
traile
r
: add test with an old style conflict
bl
o
c
k
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Chri
s
t
ian
Couder
trai
l
er: reu
s
e
ignore_
n
on_trai
l
e
r
() to
ignore c
o
n
f
lict
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Ch
r
istian Coude
r
commi
t
: make
ignore_non_trail
e
r
(
) non sta
t
ic
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christia
n
Couder
t
r
ailer:
d
is
p
l
a
y a t
r
a
iler
withou
t
its trailing new
l
ine
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christ
i
an Couder
trail
e
r:
i
gnore co
m
ment lines insi
d
e the trailers
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Couder
Documen
t
ation: add documen
t
a
t
ion
for 'g
i
t interpret
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: add tests for commands in config file
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
a
n
C
ouder
trailer: execute comm
a
nd from '
t
railer
.
<
n
a
me>
.
command
'
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
a
n Couder
trailer: add tests
f
or "git inter
p
ret-trai
l
ers"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian Couder
trai
l
er
:
add i
n
terp
r
et-trailers comm
a
n
d
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n
Couder
trailer:
p
ut
a
ll the processing to
g
eth
e
r
a
nd print
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian
C
ouder
trailer
:
parse tra
i
l
e
rs from f
i
le or stdin
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
traile
r
: proce
s
s
c
ommand line trailer arguments
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
ian Co
u
der
trail
e
r: r
e
ad a
n
d process con
f
ig information
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristia
n
Couder
trailer: process
t
railers fr
o
m inpu
t
message and a
r
guments
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
isti
a
n Couder
trailer: add data structures and ba
s
ic functions
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Chri
s
tian Couder
replace: add test
f
o
r
--
g
r
aft with a mergetag
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian
Cou
d
e
r
replace: check mergetags when using --graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
h
risti
a
n Co
u
der
re
p
l
ace: add t
e
st
f
or --
g
raft with
s
i
gned commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
replace: remove si
g
nature when using
-
-graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
co
n
trib:
add conver
t
-gra
f
ts-to-r
e
place-ref
s
.
sh
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christi
a
n Couder
Docu
m
entation: replace:
ad
d
-
-
g
r
a
ft opt
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Cou
d
er
replace: a
d
d test for -
-
graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Ch
r
istian Couder
replace: add --graft
o
ption
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Ch
r
istian Couder
replace: cleanup redirection style in tests
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
C
h
r
i
stian Cou
d
er
co
m
m
it:
add for_each_merg
e
tag(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christia
n
Couder
Docum
e
n
t
ati
o
n: replace: describe ne
w
--edit option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
replace:
add --
e
dit to
usa
g
e
string
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
replace: add
tests for --edit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
re
p
lace: die ea
r
ly if re
p
lace ref already exi
s
ts
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
replace: refactor che
c
king
r
ef val
i
dity
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
replace
:
make
s
u
re --edit re
s
ults in a different object
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-30
Chris
t
ian Couder
r
epl
a
ce info: rename 'fu
l
l' t
o
'lo
n
g' an
d
clar
i
fy in
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christia
n
Couder
D
o
cumentat
i
on
/
git-r
e
plac
e
: descri
b
e
-
-
form
a
t option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
b
u
i
ltin/replace: unse
t
read_replace_refs
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
hr
i
stian C
o
uder
t6050
:
add
tests f
o
r listing
with --format
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
hristian Co
u
d
er
builtin/r
e
place: te
a
ch listin
g
using short,
m
edium
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
sha
1
_file: perform object replacement in
sha1_objec
t
_info_ex
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian
C
o
uder
t6050:
s
how t
h
at git cat-
f
ile --b
a
tch fai
l
s
w
ith replace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Ch
r
istian Coude
r
sha1_o
b
j
e
c
t_info_extended(): add an "unsigned f
l
ags
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chr
i
stian
Couder
sha1_file
.
c:
a
d
d lookup_replace_ob
j
ect_extended()
t
o
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christi
a
n Couder
replace_object: don
'
t
check read_r
e
place_refs
twic
e
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Ch
r
i
s
tian Coude
r
ren
a
me RE
A
D_SH
A
1
_FILE_REPLACE flag to LO
O
KUP_REPLAC
E
_OBJECT
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christi
a
n Couder
strbuf: rem
o
ve p
r
efixcmp() and suffixcm
p
(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Coud
e
r
repla
c
e {pre
,
suf}fixcmp() with {star
t
s,ends}_wit
h
()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian C
o
uder
strb
u
f: in
t
rod
u
c
e starts_wi
t
h
(
)
and ends_
w
it
h
()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Ch
r
istian Couder
builtin/re
m
ote:
r
emove postf
i
xcmp() a
n
d use s
u
ffixcmp
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
C
hr
i
s
t
ian Couder
e
n
v
i
ronment: norm
a
lize use of prefi
x
c
mp
(
)
by remo
v
i
n
g
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-10-28
Christian Couder
sha1_file: move comment about ret
u
rn value where it
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chri
s
tian
Couder
t6050-replace: us
e
som
e
long option names
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
replace: allow long op
t
ion
nam
e
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
hristia
n
Couder
Documentat
i
o
n/replace:
add Crea
t
i
ng Replacem
e
nt
Object
s
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Ch
r
istian C
o
uder
t60
5
0-replace: add te
s
t to clean u
p
all the replace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christia
n
Couder
t605
0
-
r
e
place:
test
t
h
a
t
o
bjects are of the same ty
p
e
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chris
t
ian Cou
d
e
r
Docu
m
enta
t
ion
/
replace: state that object
s
must be
o
f
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chris
t
i
a
n Couder
repl
a
ce: forbid replacing an
object
with
o
n
e
of a diff
e
rent
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-30
Chris
t
ian Co
u
de
r
gitk
:
Ignore gitk-wish buildproduct
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-10
Ch
r
istian C
o
ud
e
r
Makef
i
le: detect when PYTHON_PATH changes
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-25
Ch
r
i
stian Couder
M
akefile: rep
l
a
c
e
"
echo 1>
.
.
.
" with "
e
cho >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
Christian
C
ouder
Makefile
:
repla
c
e "echo 1>
.
.
.
"
w
i
th "echo >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
Christian Couder
Make
f
ile: detect when PYTHON_PATH ch
a
nges
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-18
Chris
t
ian Couder
Ma
k
e
file:
r
emove tracking of TC
L
TK_PAT
H
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-04-22
Christ
i
a
n
Coude
r
revert: add missing va_end
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2011-09-21
Christian C
o
uder
bis
e
ct: fi
x
e
x
i
t
i
ng whe
n
che
c
ko
u
t fa
i
led
in bisect_s
t
art()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-09-27
C
hristian Cou
d
er
t6
0
50 (rep
l
a
ce):
f
i
x bogus "fetch br
a
nch with re
p
lacement
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Chr
i
stian
C
ouder
blame: use
find_comm
i
t_subjec
t
(
)
i
n
s
tead of custo
m
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian
C
ouder
me
r
ge-re
c
ursive: us
e
f
ind_commi
t
_
s
ubject() instea
d
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Chris
t
ian Couder
bisect
:
use fin
d
_comm
i
t_subject() instead of c
u
st
o
m
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christia
n
Couder
revert: r
e
nam
e
var
i
a
bles related to subj
e
ct
in get_messag
e
()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Ch
r
istian Coude
r
reve
r
t:
r
efac
t
or code t
o
find commit s
u
bject in find_comm
i
t_
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christ
i
an Co
u
d
e
r
r
evert
:
fix
o
ff by one read when searching
t
he
e
nd
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christ
i
an Couder
t3508:
add check_head_differs_from
(
) helper function
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Chr
i
sti
a
n Coude
r
rev
e
rt: im
p
r
o
ve suc
c
ess
mes
s
age
b
y add
i
ng abbreviated
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
C
hristian Couder
rever
t
:
d
on't p
r
int "F
i
nish
e
d one cher
r
y
-
pick
.
" if
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Chris
t
i
an Couder
revert:
r
e
factor com
m
i
t code
i
nto a new run
_
git_c
o
m
m
it
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian Couder
revert: report success when using option --strategy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Christian C
o
ude
r
Document
a
tion: grep: fix asci
i
doc problem with --
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Christian
Coud
e
r
revert: acc
e
pt arb
i
trary rev-li
s
t options
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-13
C
h
r
i
stian Couder
commit: use valu
e
of GIT_RE
F
LO
G
_ACT
I
ON env v
a
r
iable
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-06
Christi
a
n Couder
diff: fix "git show -C -C" outpu
t
when ren
a
m
i
n
g
a binary
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
hristia
n
Couder
Documentation/
r
ev
e
rt: de
s
cribe pas
s
ing
more than one
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
h
ristian Couder
Do
c
um
e
ntation/cherry-
p
ick:
d
escri
b
e
p
a
ssing more than
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Ch
r
istian
C
ouder
revert:
a
d
d
t
ests
to
che
c
k
ch
e
rry-picking
many commits
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Chr
i
s
t
ian Couder
revert:
a
llow cherr
y
-picking mo
r
e than o
n
e
c
ommit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian
Couder
r
e
vert:
c
h
ange help_msg(
)
to tak
e
no
a
rg
u
ment
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Chr
i
s
tian Coude
r
re
v
ert: ref
a
ctor code into a do_pi
c
k_c
o
m
mit() function
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
h
risti
a
n Couder
r
e
vert: use run_co
m
man
d
_
v
_opt() instead of ex
e
c
v
_git_cmd()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Couder
rever
t
: cleanup
code for -x option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christian Couder
r
e
vert
:
add "--
s
t
rategy" option
t
o ch
o
ose merge
s
t
r
a
tegy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
C
hri
s
tian
C
ouder
merge: mak
e
function try_me
r
ge_command non static
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christia
n
Couder
merge: refactor
c
od
e
that calls "git merge-STRATEGY"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
next