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
write_untracked_extension: use FLEX_ALLOC helper
2015-12-10
Ch
r
is
t
ian Couder
Documentati
o
n/git-upda
t
e-index
:
a
d
d miss
i
ng
opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-11-24
Christian Couder
D
o
cumen
t
ation/git-update-index:
a
dd
m
issin
g
opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Christian Couder
quote: move comment
before sq_qu
o
te_buf()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Christian Co
u
d
e
r
qu
o
te: fix b
r
oken
sq_quote_buf() r
e
l
ate
d
com
m
en
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-08-31
C
h
ristian Cou
d
e
r
t
r
ailer:
support multil
i
ne
t
itle
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-26
Ch
r
istian
Coude
r
trai
l
er: ret
i
t
l
e a test
a
n
d
corr
e
ct an in-comment message
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-21
Christi
a
n Couder
trailer: ignore first line of message
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Chr
i
stian Cou
d
er
bis
e
ct:
add t
e
st
to
check t
h
at revs are properly par
s
ed
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Christia
n
Couder
bisect:
p
ar
s
e re
v
s before passing
t
he
m
to ch
e
ck_e
x
pec
t
ed_revs(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
t
r
ailer
:
add te
s
t with an old s
t
yl
e
c
o
nflict
b
lock
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Coud
e
r
tr
a
iler:
r
euse
i
gn
o
re_non_trailer() to ig
n
ore conflict
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
C
h
ri
s
tian C
o
ud
e
r
commit: make ignor
e
_non_trailer() non static
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Chri
s
tian Couder
t
r
ailer: display a
tra
i
l
er
w
ithout its
t
railing newlin
e
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian
Couder
trailer: ign
o
re comme
n
t
lines inside the trai
l
e
rs
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
Document
a
t
i
on: add documentation f
o
r
'
git interpr
e
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
t
railer: add tests for commands in c
o
nf
i
g f
i
le
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Co
u
der
trailer: execut
e
comm
a
nd from 'trai
l
er
.
<name>
.
command'
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer:
a
d
d
t
ests for "git inte
r
pret-trail
e
r
s
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
hristian Couder
trailer: add interpret-tra
i
l
ers comma
n
d
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
istian Couder
trail
e
r
: put all t
h
e
p
r
oces
s
ing
t
o
g
ether and print
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Cou
d
er
trailer:
p
a
rse trail
e
rs
from file or stdin
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: process command
l
ine trailer
a
r
gu
m
e
n
ts
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
hristian Couder
t
r
ailer
:
read and process config inf
o
rmation
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an Co
u
d
e
r
t
r
ailer: process trail
e
rs from input me
s
sage a
n
d arg
u
ments
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
istian Couder
t
rai
l
er: add dat
a
structures and basic functions
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Chri
s
t
ian
C
o
ud
e
r
rep
l
ace: add test for -
-
graft
with a mergeta
g
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christ
i
an Coud
e
r
replace:
c
heck
m
erg
e
tags wh
e
n usi
n
g
-
-
g
raf
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian
C
o
uder
replace: add t
e
st for --graft with signed commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Ch
r
istian
Couder
replace: remove signat
u
re when using --gr
a
ft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Chri
s
tian
C
oud
e
r
c
o
ntrib: add convert-grafts
-
t
o
-repla
c
e-refs
.
sh
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
h
ristian
Couder
Documentation
:
replace: add --graft o
p
tion
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian
C
o
uder
r
ep
l
ace: add test
for -
-
g
r
aft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
replac
e
: add --graft opt
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Chris
t
ian Cou
d
er
replac
e
: cleanup redirect
i
o
n style
i
n
t
ests
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Christian Couder
c
o
m
m
it
:
add for_each_merge
t
ag()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian
C
ouder
Documentation: replace: describe new --edit option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
replace:
add --
e
dit to usage string
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Chr
i
stian
C
ouder
replace: add tests for
-
-e
d
it
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
C
hristian Couder
r
e
place: d
i
e early i
f
repla
c
e re
f
a
l
r
e
a
dy ex
i
sts
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
replace: refactor checking ref validit
y
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Chris
t
ian Couder
replace: m
a
k
e
su
r
e --e
d
it
r
esults in a different object
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-30
Christian Couder
replace info: rename
'fu
l
l' to 'long' and clarify in
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
Documenta
t
ion/git-rep
l
a
c
e: describ
e
--fo
r
ma
t
optio
n
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
hri
s
tian Cou
d
er
b
u
i
ltin/r
e
place: unset r
e
ad_replace_refs
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chr
i
stian Couder
t6050: add
t
ests for listi
n
g wi
t
h --
f
o
rmat
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ristian Couder
builtin/replace:
t
each listing
using short, medium
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ristian Coud
e
r
s
ha1_
f
ile: perform
object replacement in sha1_
o
bject_inf
o
_ex
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
t6050: s
h
ow
t
hat git cat-fi
l
e --batc
h
fa
i
ls with repla
c
e
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christi
a
n Couder
sha1_object_in
f
o_ext
e
n
ded
(
): add an "un
s
igned flags
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christ
i
an Cou
d
er
sha1_
f
ile
.
c: add loo
k
up_replac
e
_o
b
jec
t
_
extende
d
()
t
o
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christia
n
Couder
re
p
lace_
o
bject: don't check re
a
d
_replace_r
e
fs t
w
i
c
e
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ristian Co
u
der
rename REA
D
_SHA1_FI
L
E_REPLACE flag t
o
LOO
K
UP_REPLACE_OBJECT
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Couder
strbuf: remove pref
i
xcmp(
)
and suffixc
m
p()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Couder
re
p
l
ace {pre,suf}fix
c
mp() with {start
s
,
e
nds}_with()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Ch
r
i
stian Couder
st
r
buf
:
introduce starts_
w
ith() and ends_with()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christi
a
n Couder
b
u
iltin/remote: remov
e
po
s
tfixcmp(
)
and use suffixcmp
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christia
n
C
ouder
environment: normalize use of prefixcmp()
b
y
removing
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-10-28
C
h
r
is
t
ian Couder
sha1_fi
l
e: move co
m
men
t
about re
t
u
rn
v
a
l
ue where it
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
hristian Couder
t
6
0
50-replace
:
use s
o
me long option n
a
mes
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
re
p
lace: allow
l
ong
opt
i
on names
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christ
i
an C
o
uder
Documen
t
at
i
on/replace
:
add Creating
Replacemen
t
Obj
e
c
ts
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christi
a
n
Couder
t
6050
-
replace
:
ad
d
test to clean up all the
r
eplace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian Co
u
der
t6050-re
p
lace: te
s
t
that objec
t
s a
r
e
of the same
type
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chr
i
stian Couder
D
ocume
n
tation/replace:
s
ta
t
e that objec
t
s
m
u
s
t
be of
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
h
rist
i
an Coud
e
r
r
e
pla
c
e: forbi
d
replacing an object with one of a
different
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-30
Christia
n
C
ouder
gitk: Ignore git
k
-w
i
s
h
buildproduct
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-10
C
h
r
i
s
t
i
a
n
Couder
Makefile: detect when PYTHON_PATH
changes
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-25
Chr
i
stian Coud
e
r
Makefil
e
:
r
e
p
lace "ec
h
o 1>
.
.
.
" with "echo >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
C
h
risti
a
n Couder
Ma
k
efile:
r
eplace "echo 1>
.
.
.
" w
i
th "echo >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
Chri
s
tia
n
Couder
Makefile
:
d
e
tect when PYTHON_PATH c
h
an
g
es
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-18
Christian
C
o
ud
e
r
Makefile:
r
emov
e
trac
k
ing of TCLTK_PATH
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-04-22
Christian Couder
r
e
ver
t
: ad
d
miss
i
ng
v
a_end
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2011-09-21
C
h
r
istian Coude
r
bisect: fi
x
e
x
i
ting when checko
u
t fail
e
d
in bisect_s
t
ar
t
()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-09-27
Christian Couder
t6050 (replace): fix bogus "
f
etch branch wi
t
h replace
m
e
nt
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian C
o
uder
b
l
a
m
e: use find_commit_subje
c
t()
i
ns
t
ead o
f
c
ustom
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
C
h
ristian Coude
r
mer
g
e-recur
s
ive: use fi
n
d_commit_su
b
ject() inste
a
d
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
C
hristian Couder
bisec
t
: us
e
find_commit_sub
j
ect() in
s
tead
o
f custo
m
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Coud
e
r
revert: rename var
i
ables related to su
b
j
e
ct in
get_me
s
s
age()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christi
a
n
Couder
revert: refactor code to find
c
ommit subject
in f
i
nd_commi
t
_
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
C
h
r
i
stian Co
u
d
er
r
e
v
e
r
t:
fi
x
off
b
y one r
e
ad
wh
e
n searching t
h
e en
d
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
t35
0
8: add check_head_diffe
r
s
_fro
m
() helper
f
unction
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Chris
t
ian Coud
e
r
reve
r
t: improve success
m
e
s
sage
by adding abbreviated
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christi
a
n Cou
d
er
revert:
d
on't
p
r
i
n
t
"
F
i
n
ished one cherry-pick
.
" if
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian
C
ouder
rev
e
rt: refactor comm
i
t
co
d
e
i
nto a new
run_git_co
m
mit
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
C
h
rist
i
an
Couder
rever
t
: report su
c
c
es
s
when
using
o
ption
--
s
trategy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Christia
n
Couder
Documen
t
ati
o
n: grep: f
i
x as
c
iido
c
pro
b
l
e
m with
-
-
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Christi
a
n Couder
rever
t
: ac
c
ep
t
a
r
b
itrary rev-list opt
i
ons
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-13
C
h
r
istian Coud
e
r
com
m
it
:
u
se value of GI
T
_
R
EF
L
OG_
A
CTION env variable
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-06
Chri
s
tian Couder
diff
:
fix "git show -C -C" outp
u
t
when renamin
g
a binary
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian C
o
ude
r
D
o
c
u
ment
a
t
ion/rev
e
rt: describe passing m
o
re than one
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian C
o
u
d
e
r
Documen
t
ation/ch
e
r
r
y-pick: d
e
scribe passing more t
h
an
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
hristian Couder
revert: add tests to check c
h
er
r
y-picking ma
n
y
commits
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Couder
revert: allow ch
e
rry-picking m
o
re
t
han
o
ne commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christia
n
Co
u
der
re
v
ert: change
h
elp_
m
sg()
t
o t
a
ke no
argum
e
nt
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Couder
rever
t
: refactor
c
ode in
t
o a do_p
i
ck_
c
ommit() funct
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Ch
r
istian Couder
rev
e
r
t
: use ru
n
_command_v_opt
(
)
instead of
e
x
ecv_git_cmd()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christia
n
Coud
e
r
revert: cleanup code fo
r
-
x option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christ
i
an Co
u
der
r
e
vert: add "--stra
t
egy" o
p
tion to choose me
r
ge strategy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Chri
s
tian C
o
uder
me
r
ge
:
make
function try_merge_command non static
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christian Couder
merge: refact
o
r code
that
c
a
lls "git
m
e
rge-STRATEGY"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
next