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
http: consolidate #ifdefs for curl_multi_remove_handle
2015-12-10
Christian
Co
u
der
Docu
m
entation/git-up
d
ate-i
n
dex: add missing opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-11-24
Christian
Co
u
der
Documentation/git-update-index: add
m
issi
n
g opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Christian Couder
qu
o
te: m
o
ve comment befo
r
e sq_quo
t
e_buf()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
C
h
rist
i
an C
o
ud
e
r
quote:
fix br
o
ken sq_quote_buf()
r
elated c
o
m
m
ent
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-08-31
C
h
r
i
stian Co
u
der
tr
a
iler: support
m
ultil
i
ne
t
i
tle
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-26
Chris
t
ian C
o
u
der
trailer: retitle a test and correct an
i
n-comment me
s
s
age
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-21
Christ
i
an Coude
r
t
railer
:
ignore fi
r
s
t
li
n
e of message
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Christian Coud
e
r
bisect: add test to chec
k
that rev
s
are p
r
operly parsed
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Chris
t
ian Couder
b
i
sect: parse r
e
vs b
e
fore passing them to check
_
exp
e
cted_revs()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Cou
d
e
r
traile
r
: add test with an o
l
d s
t
y
le conflict b
l
o
ck
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
C
h
r
i
s
t
ian Couder
trailer: reuse ignore
_
non
_
t
railer() t
o
ignore
conflict
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
comm
i
t: make igno
r
e_non_t
r
ailer() n
o
n static
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Chri
s
tian Cou
d
e
r
trailer: display
a
trailer without
i
t
s
trailing newline
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
C
hris
t
ian
Couder
trai
l
e
r
:
ignor
e
comment
lines insi
d
e t
h
e trailers
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
Docum
e
ntation: add documentation for 'git interpret
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an Couder
trai
l
er: add te
s
ts
f
or commands in c
o
nfig file
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
istian Couder
trailer: execute comman
d
f
r
om
'trailer
.
<name>
.
c
ommand
'
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
h
r
i
s
tian Co
u
der
trailer
:
add te
s
ts fo
r
"git interpret-trailers"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristian Couder
trailer: add
i
nterpret-tr
a
ilers command
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian
C
ouder
t
rail
e
r:
p
ut
a
l
l the process
i
n
g
to
g
ether a
n
d p
r
int
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
st
i
an Couder
t
r
a
i
l
er: p
a
rse tr
a
ile
r
s fro
m
file or stdin
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian Couder
trailer: p
r
ocess command line trailer a
r
guments
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
h
ristian Couder
trailer: read an
d
process config
information
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
h
r
istian Couder
tr
a
iler: proc
e
ss
t
rail
e
rs f
r
o
m
input me
s
sage and argumen
t
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
ud
e
r
trailer: add data
s
tructur
e
s
a
nd ba
s
ic func
t
ions
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Chr
i
st
i
an
C
ouder
rep
l
a
ce: add
t
est for --graf
t
with
a me
r
geta
g
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
replace:
ch
e
ck mergetags when using --graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christi
a
n Couder
rep
l
ace
:
add test
for
--gr
a
ft with signed commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christ
i
an Co
u
der
r
eplace: remove
signature when using --g
r
af
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Chris
t
ian Couder
co
n
trib: add convert-grafts-t
o
-r
e
plac
e
-
refs
.
sh
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
hristian Coud
e
r
Documen
t
ation:
replace: add --gra
f
t
op
t
ion
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
h
ristian Couder
replace:
add t
e
st for --graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
h
r
i
s
tian Couder
replace:
add --gr
a
ft o
p
t
ion
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Chr
i
s
t
ian Coude
r
re
p
lace:
cleanup
r
e
direc
t
i
on style in
te
s
ts
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Chri
s
tian Co
u
der
com
m
it: add for_each_mergetag()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
C
h
r
i
stian Coud
e
r
Documentation:
r
e
p
l
a
c
e:
d
e
s
cribe new --edit
o
ptio
n
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Chri
s
tian Couder
replace: add -
-
edit
to us
a
ge string
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian
C
o
u
der
r
epl
a
ce: add tests for --e
d
it
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Ch
r
istian
C
o
uder
rep
l
ace: die early if repla
c
e ref already exists
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Chr
i
stian Couder
replace:
refact
o
r checki
n
g ref validity
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Chri
s
tian Coude
r
replace: make sure -
-
e
d
it results in
a
d
i
ffere
n
t o
b
ject
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-30
C
h
ris
t
ian Couder
replace info: r
e
name
'
ful
l
' to 'long' and
c
larify i
n
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chr
i
st
i
an Couder
Documentati
o
n
/
git-rep
l
ace: descr
i
be --format opti
o
n
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
b
u
i
lt
i
n/repl
a
ce: unset read_repl
a
ce_refs
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ristian C
o
u
d
er
t6050: add
tests fo
r
listing with --format
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Co
u
d
e
r
builtin/
r
eplace
:
te
a
ch listin
g
using short, med
i
u
m
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
sha1_file: perform objec
t
re
p
la
c
ement in sha1_object_info_ex
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
hr
i
s
tian Coud
e
r
t
6
050: show that gi
t
c
a
t-file --batch fails wi
t
h
r
epla
c
e
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chris
t
ian
Couder
sha1
_
object_info
_
e
x
tend
e
d(
)
: a
d
d an "unsigned flags
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chris
t
i
a
n Co
u
der
sha1
_
file
.
c: a
d
d
l
o
okup_repl
a
ce_ob
j
ect_exten
d
ed() to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chr
i
stian Couder
replace_obj
e
c
t
:
don't check
r
e
a
d
_rep
l
ace_refs t
w
ice
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
r
e
n
ame R
E
AD_SHA1_FILE_REPLACE flag to
LOOKUP_
R
E
P
LACE_OBJECT
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Cou
d
er
strbuf: remove prefixcmp() and suffixcm
p
()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Cou
d
e
r
repl
a
ce {pre,suf}fixcmp() with {
s
tar
t
s,ends}_with()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
C
hr
i
stian Couder
s
trbuf: intro
d
uce starts_
w
ith() and ends_w
i
t
h()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christ
i
an
Coud
e
r
builtin/r
e
mote:
remove postfixcmp() and u
s
e suf
f
ixcmp
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Couder
environm
e
nt: normalize use of pr
e
fix
c
m
p
() by removing
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-10-28
Christian
Couder
sha1_fi
l
e: m
o
ve comm
e
n
t about return val
u
e
wher
e
i
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chris
t
ian Coud
e
r
t6050
-
replace: use some long option names
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Ch
r
is
t
ian
C
o
uder
replace: allow long opti
o
n
n
ames
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christ
i
an Coud
e
r
D
o
c
um
e
ntation/repl
a
ce: add C
r
eat
i
ng Replacem
e
nt Objects
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
t
605
0
-re
p
lace: add t
e
st to clean u
p
all the repl
a
c
e
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christi
a
n
Cou
d
er
t60
5
0-
r
eplace:
test that object
s
a
r
e of the
s
ame type
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
h
rist
i
an
Co
u
d
e
r
Do
c
u
men
t
ation/replac
e
: state that objects
must b
e
o
f
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chri
s
tian Couder
rep
l
ace: forb
i
d replacing an object with one of
a
diff
e
ren
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-30
Christia
n
Coud
e
r
git
k
: Igno
r
e g
i
tk
-
wish
build
p
r
o
duc
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-10
Chris
t
ian Co
u
der
Makefile
:
det
e
ct when PYTHON_PATH
changes
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-25
Christian Couder
Makefile: replace "echo 1>
.
.
.
"
with
"ech
o
>
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
Christian Couder
Makefile: replac
e
"e
c
ho 1>
.
.
.
" w
i
th "ec
h
o
>
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
Christian Co
u
der
Ma
k
e
f
ile: detect
when PYTHON_PATH cha
n
ges
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-18
Christian Couder
Makefile
:
remov
e
t
r
a
c
k
in
g
of TCLTK_PATH
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-04-22
Chri
s
tian Co
u
der
r
e
vert:
a
dd missi
n
g
v
a
_end
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2011-09-21
C
hris
t
ian Coude
r
b
i
sect:
fix exiting when
c
h
eckout
fa
i
led in bisect_start()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-09-27
Christi
a
n Couder
t6
0
50 (
r
e
p
lace
)
: fix bo
g
us "fetch bra
n
ch
w
ith
r
eplac
e
ment
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian
C
ouder
blame: u
s
e find_commi
t
_
subject() instead of
custom
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
merge-recur
s
ive: use find_commit_su
b
ject() i
n
ste
a
d
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christia
n
C
o
uder
bisec
t
:
u
se find_c
o
mmit
_
subject() instead of
custom
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Ch
r
isti
a
n Couder
revert: rename variable
s
rel
a
ted to subj
e
ct in
get_message()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
revert: refactor cod
e
t
o find
c
ommit s
u
b
ject in find_commit
_
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
C
hristi
a
n Coud
e
r
revert: fix off by
o
ne read when searchi
n
g the end
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christia
n
C
o
u
d
er
t3508:
add check_head_di
f
fers_from(
)
he
l
p
er function
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christi
a
n Couder
revert
:
improve s
u
ccess message b
y
adding abbreviated
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian C
o
uder
revert:
d
on't
print "
F
i
n
ished one ch
e
rry-pick
.
"
if
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian Cou
d
er
re
v
ert: refac
t
or co
m
m
i
t
c
ode into a new run_git_commit
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian Couder
r
evert
:
rep
o
rt success when usin
g
opt
i
on --strate
g
y
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Chr
i
stian
Coude
r
Documentation: grep: fix asci
i
doc p
r
oblem w
i
th --
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Chris
t
ian C
o
uder
revert: a
c
c
ept arbitrary rev-lis
t
options
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-13
Chris
t
ian Couder
c
o
mmit:
u
se val
u
e
o
f GIT
_
REFLOG_A
C
T
I
ON env varia
b
le
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-06
Chri
s
ti
a
n Couder
diff: fix
"g
i
t sh
o
w
-
C
-C"
output w
h
en renaming a
b
inary
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christ
i
an Couder
D
o
cu
m
entation/revert: desc
r
ibe
passing m
o
re than one
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Chri
s
tian
Cou
d
er
Docu
m
entat
i
on
/
c
herry-p
i
ck: describe passing m
o
re than
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
hri
s
tian Couder
revert: add tests t
o
check cherry-pic
k
ing
m
any
com
m
its
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
h
risti
a
n Coud
e
r
revert: allow cherry-pick
i
ng mor
e
than one commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
h
ristian Coud
e
r
r
eve
r
t
: change hel
p
_ms
g
(
)
t
o
tak
e
no argument
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
hristia
n
Couder
r
ever
t
: ref
a
ctor cod
e
i
n
to a
d
o_pi
c
k_c
o
mmit() function
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Couder
r
e
v
e
rt: us
e
run_command_v_op
t
() instead of ex
e
c
v_git_
c
md
(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
h
r
istian Cou
d
e
r
revert: cle
a
nup code for -
x
o
p
t
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christian
Cou
d
er
revert: add
"
--strategy" o
p
tion to choose merge str
a
tegy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christ
i
an Couder
merge: make fun
c
t
ion try
_
m
e
rge_
c
o
mmand non stati
c
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Chr
i
stian Couder
merge: refactor code th
a
t
calls "git
m
e
r
ge-
S
TRATEGY"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
next