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
mv: allow moving nested submodules
2015-12-10
Christian
Couder
Documentat
i
o
n
/git-update-index: add
m
issin
g
opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-11-24
Ch
r
ist
i
an Couder
Documentation/git-update-index: add missi
n
g opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Chr
i
stian Couder
quote: move comment before sq_
q
uote_buf(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
C
h
ristian Couder
quot
e
: fix broken sq_quote_buf()
relate
d
c
o
mment
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-08-31
Christ
i
an Couder
trailer: support mul
t
iline title
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-26
C
hristi
a
n
Couder
trailer
:
retitle
a
te
s
t
and correc
t
an i
n
-comment message
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-21
C
hris
t
ian
Coud
e
r
trailer:
igno
r
e first line
o
f mess
a
g
e
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Christian
Couder
bisect: a
d
d test to check
t
hat r
e
v
s
are properl
y
pars
e
d
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Christian
Coud
e
r
bi
s
ect: parse
r
evs
bef
o
re passin
g
them t
o
ch
e
ck_
e
x
pected
_
revs()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
C
h
ristian Couder
t
r
ailer
:
add test with a
n
old style conflict block
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Chri
s
t
i
an Couder
trai
l
er: reuse ignore_non_traile
r
()
to ignore confli
c
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
C
h
r
istia
n
Couder
commit: make
ig
n
ore_non_trailer()
n
on static
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian C
o
uder
trailer: dis
p
lay a tr
a
il
e
r
wit
h
o
u
t its trailin
g
newline
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
trailer
:
ignore comment l
i
nes insid
e
the trail
e
rs
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
Documenta
t
io
n
:
a
dd documentation
f
or 'git interpret
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n Coude
r
trailer: add tests for commands in c
o
nfig fil
e
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristian Couder
trailer
:
ex
e
cute comm
a
nd from 'trailer
.
<name
>
.
c
o
mmand'
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
tr
a
iler: add tests for "gi
t
in
t
erpret-
t
railers"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian
C
ouder
trailer:
ad
d
i
nt
e
rpret-trailer
s
command
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trail
e
r: pu
t
all
the process
i
n
g toget
h
e
r
a
nd pr
i
n
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chris
t
i
an
C
ouder
trail
e
r: pars
e
trail
e
rs from file or
s
tdin
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
t
i
an Couder
trailer:
pr
o
ces
s
c
o
mmand line trailer argum
e
nts
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian Couder
t
r
ailer: read
and process config information
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: process trailers
from input me
s
sag
e
and arg
u
ments
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n Couder
trailer
:
a
d
d
d
ata st
r
uctures and basic functions
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian
C
ouder
replac
e
: add
t
e
s
t for --graft with a
mergetag
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
h
ristian Couder
replace: che
c
k merget
a
gs when
u
sing -
-
gr
a
ft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian
C
ouder
replace: add
t
est f
o
r
-
-graft with signed comm
i
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Ch
r
istian Co
u
der
rep
l
ace: remove
s
ignature when u
s
ing
-
-
graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
contrib: add conve
r
t-grafts-t
o
-repla
c
e-refs
.
s
h
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Cou
d
er
Docu
m
entation: replace
:
a
dd --graft opt
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Co
u
der
replace: add test for
--graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Chri
s
tian
Couder
repl
a
ce: add --graf
t
o
p
t
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Christian Cou
d
e
r
repla
c
e
: cleanup redirec
t
ion sty
l
e in test
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Chr
i
st
i
an Cou
d
e
r
comm
i
t:
a
dd for_e
a
ch_merg
e
tag()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Ch
r
i
s
t
i
an C
o
uder
D
ocu
m
e
n
tation
:
replace: descri
b
e new
-
-edit option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
replace: add --edit t
o
usag
e
strin
g
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian
C
ouder
replace:
ad
d
tests for --edi
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian C
o
u
d
er
replace: die ea
r
l
y
if replac
e
ref already exists
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Coude
r
replace: refactor checking
ref
validit
y
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Chr
i
stian Couder
replace
:
make sure --edit re
s
u
l
ts in a
di
f
fe
r
ent object
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-30
Christian Co
u
der
replace i
n
fo:
rename
'
ful
l
'
to
'
l
ong' an
d
c
larify in
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christia
n
Couder
Documenta
t
ion/git-replace: d
e
scr
i
be --fo
r
m
a
t option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
hristian Couder
b
uil
t
i
n/replace
:
unse
t
r
ea
d
_replace_ref
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Co
u
der
t6050:
add tests for listin
g
wi
t
h --format
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Co
u
der
b
uil
t
i
n
/replace:
teach listing
usi
n
g short, me
d
i
um
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christi
a
n Couder
sha1_file: perform ob
j
ec
t
r
e
placemen
t
i
n sha1_obje
c
t
_info_ex
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
t6050: show tha
t
g
it cat-file --ba
t
c
h fails wit
h
replace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
sha1_object_info_e
x
tended(): add an "unsi
g
ne
d
flags
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chr
i
stian
Couder
sha1_file
.
c
: ad
d
lo
o
kup
_
replace_
o
bject_ex
t
ended() to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chris
t
ian Couder
replace_obje
c
t: don'
t
che
c
k re
a
d
_
rep
l
ace_ref
s
tw
i
ce
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Ch
r
ist
i
an
Couder
rename READ_SHA1_
F
I
L
E
_REP
L
ACE flag to LOO
K
UP_REPL
A
CE_OBJECT
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Couder
strbuf: remove prefixc
m
p
(
) and suffixcmp()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Couder
replace {p
r
e,suf}fixc
m
p() with {starts,ends}_wi
t
h(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
C
hri
s
tian Couder
strbuf
:
in
t
r
o
duc
e
st
a
rts_with()
a
nd
e
nds_with()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christ
i
an Couder
builtin/remote: remove postfixcmp
(
) and u
s
e s
u
ffixcmp
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Chris
t
ian C
o
uder
e
n
v
ironment: no
r
ma
l
i
ze use of
pr
e
fixcmp() by removing
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-10-28
Chr
i
s
ti
a
n Coude
r
sha1_file: move comment a
b
o
u
t
r
eturn value where it
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Ch
r
istian
Coud
e
r
t6050-repl
a
ce: us
e
some long op
t
ion na
m
e
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christi
a
n Coude
r
re
p
l
ace:
allow long o
p
t
ion nam
e
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian Cou
d
er
Docum
e
ntation/rep
l
ace: add
C
rea
t
ing Replacement Objects
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chri
s
tian Couder
t605
0
-rep
l
ace: add test t
o
clean
up
a
ll the
r
eplace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
hr
i
s
t
i
an
Cou
d
e
r
t605
0
-repla
c
e
:
t
e
st that obj
e
cts are of the s
a
me ty
p
e
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
h
ristian Couder
Documentation/replace: st
a
te
t
hat objects m
u
s
t
be of
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Ch
r
isti
a
n
Couder
rep
l
a
ce: forbid replacing a
n
obj
e
ct with one of a different
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-30
Christian Couder
gitk: Ig
n
ore
g
itk-wish buildpr
o
duct
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-10
Ch
r
i
s
tian Couder
Makefile:
d
etect when PY
T
HON_PATH cha
n
ges
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-25
Christian Coud
e
r
Ma
k
efile: replace "echo 1>
.
.
.
" wi
t
h "echo >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
C
h
r
i
stian Couder
Makefil
e
:
r
eplace "echo
1
>
.
.
.
" wi
t
h "echo >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
Chri
s
tian C
o
ude
r
M
ake
f
ile: dete
c
t when PYTHON
_
P
A
TH changes
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-18
Christian Couder
Ma
k
efi
l
e:
r
emove
t
rackin
g
of TCLTK_PA
T
H
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-04-22
C
h
ristian Couder
re
v
ert:
ad
d
mis
s
ing va_end
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2011-09-21
Christian Couder
bisect: fix exit
i
ng when checko
u
t
f
a
i
led in
b
i
sect_start
(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-09-27
C
h
ristian C
o
u
der
t6050 (replace): f
i
x bogus "fetch bra
n
ch with replac
e
ment
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Chr
i
stian Couder
b
lame: use
f
ind_com
m
it
_
s
u
bj
e
c
t
()
i
nstead
of custom
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
merge-recurs
i
ve
:
use
f
ind_comm
i
t_subject() instead
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
bisect: use find_c
o
mmit_
s
ubject()
i
n
s
tead
o
f custo
m
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
revert: rename
vari
a
bles
rela
t
ed
t
o su
b
ject
in get_m
e
ssag
e
()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christia
n
C
ouder
re
v
ert
:
ref
a
ctor code to find commit s
u
bject in find
_
commit_
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
rever
t
: fix off by one read when searchin
g
t
he end
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Chri
s
tian Cou
d
e
r
t3508:
a
dd
c
h
eck_head
_
differs_from(
)
helper
fu
n
ction
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian
C
o
u
der
revert: im
p
r
o
ve success message by adding abbre
v
iat
e
d
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Ch
r
istian Couder
rev
e
rt: don't print "Fini
s
h
ed
o
ne cherry-pick
.
" if
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian Couder
reve
r
t: re
f
a
c
tor
c
o
m
mit code
i
n
t
o
a
new run_git_commit
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian C
o
uder
reve
r
t: rep
o
rt success w
h
en u
s
ing option
--stra
t
egy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Ch
r
istian Couder
Documentation: g
r
ep: fix asc
i
i
doc probl
e
m
with
-
-
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
C
h
r
istian
C
ouder
revert: accept arbitrary re
v
-list options
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-13
Christian Couder
commit: use val
u
e of GIT
_
REFLOG_ACTION env variable
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-06
Christ
i
an Couder
d
iff: fix "git show -C -C"
o
utput when
r
e
n
a
m
ing a binary
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Chr
i
s
t
i
a
n
C
ouder
Docum
e
ntati
o
n/revert: describe
p
assing mo
r
e than
o
ne
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Couder
Do
c
umentatio
n
/cherry-pick: d
e
s
cribe pa
s
sing m
o
re than
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Ch
r
ist
i
an
C
oud
e
r
r
ever
t
: add tests to ch
e
ck cherry-picking many comm
i
t
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian C
o
uder
revert
:
a
llow cherry-pickin
g
mo
r
e
t
ha
n
o
ne commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
h
ristian Couder
reve
r
t: chang
e
he
l
p
_
msg() to
take no a
r
gument
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christi
a
n
C
o
uder
rev
e
rt: refactor code into a do_
p
ick_comm
i
t() f
u
nction
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
h
ristian Couder
rev
e
r
t: use
r
un_c
o
mmand_v_opt() instead of execv_g
i
t_cm
d
()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Couder
rev
e
rt: cl
e
an
u
p
c
ode for -
x
option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christ
i
an Co
u
der
revert: add
"
--strateg
y
"
opti
o
n to choose me
r
ge s
t
r
at
e
gy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Ch
r
istian Coude
r
merge: make function
t
ry
_
merge_com
m
and n
o
n static
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christi
a
n
C
ouder
merge: refact
o
r code that cal
l
s "git merge-STRATEGY"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
next