repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
trailer: ignore comment lines inside the trailers
2014-11-10
C
h
rist
i
a
n
Couder
trailer: ignore comment lines inside t
h
e
t
r
a
ilers
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
C
h
rist
i
an Couder
Documenta
t
ion: add documentat
i
on for 'git int
e
rpr
e
t
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: add
tes
t
s for
comman
d
s
i
n confi
g
file
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
Christian
Couder
trail
e
r: execute command from 'trail
e
r
.
<
name>
.
command'
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Co
u
de
r
t
rail
e
r: add
t
es
t
s f
o
r
"
g
it interpret-trailers"
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
C
h
r
i
stia
n
Coud
e
r
trailer: add
interp
r
et-tr
a
ilers command
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
C
h
risti
a
n
Couder
trailer: put
a
ll the pr
o
cessi
n
g to
g
ether an
d
pri
n
t
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
Christian Coude
r
trailer: p
a
rs
e
tr
a
ilers from
f
i
le or stdin
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Couder
trailer:
p
roces
s
command
l
ine trailer arg
u
ments
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
C
hri
s
tian Co
u
der
trailer: read
a
nd
p
rocess
config informati
o
n
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
uder
tr
a
iler
:
process trailers
from input message and
arguments
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n
Coude
r
trail
e
r: add data structures
a
nd b
a
s
i
c f
u
nctions
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christian Cou
d
er
replace: add test for --gr
a
ft wit
h
a
mergetag
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christi
a
n Couder
replace: chec
k
mer
g
e
t
a
gs w
h
en
u
s
ing -
-
g
raft
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Chris
t
ian Couder
r
eplac
e
:
a
dd test
f
or --gr
a
ft wi
t
h s
i
gned commit
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christi
a
n Couder
replace: remove
signat
u
r
e when
using --
g
raft
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Ch
r
istian
Couder
contrib
:
add convert-grafts-to-repl
a
ce-refs
.
s
h
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
Documentation:
r
eplace: add -
-
g
raft opti
o
n
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
C
hr
i
stia
n
C
o
uder
replace:
a
dd test for
--graft
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
replace:
a
d
d
--graft option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-07
Christian Couder
r
eplace: cleanup
redirection style in tests
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-07
Christ
i
an Couder
commit
:
add
f
o
r
_
each_merg
e
t
ag()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Ch
r
i
stian
C
oud
e
r
Documentation: replace: describ
e
new --edit opt
i
on
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
re
p
l
ace: add --edit
t
o usage string
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Chris
t
ian Couder
replace
:
add t
e
sts for -
-
edit
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Christian Cou
d
e
r
r
eplace:
di
e
early i
f
r
e
place re
f
a
l
rea
d
y
exists
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Chr
i
stian Couder
replace
:
re
f
actor checki
n
g
ref va
l
idity
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Christian
C
ou
d
er
replace
:
make sure --edi
t
results in a
different o
b
ject
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-30
C
h
ristia
n
Cou
d
er
replace info: re
n
am
e
'full' to 'long' an
d
clarify i
n
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ri
s
tia
n
Cou
d
er
Docum
e
n
ta
t
ion/
g
it-
r
epla
c
e: descri
b
e --fo
r
mat option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
C
hris
t
i
a
n Couder
b
uiltin
/
rep
l
ace
:
uns
e
t read_r
e
place_r
e
fs
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Chris
t
i
an Couder
t6050: add t
e
s
ts fo
r
listin
g
with --format
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Christia
n
Couder
builtin/replace: teach listing
us
i
ng shor
t
, medium
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
sha
1
_file: perform object
replacement in s
h
a1_object_info_ex
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
t6050:
show
t
h
at
git cat-file
--batch
fails with replace
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
sha1
_
object_info_ext
e
nd
e
d(): add an
"
unsigned
flags
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Chr
i
stian
C
o
uder
sha1_f
i
le
.
c
: ad
d
lookup_replace_
o
bject_extended() to
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Ch
r
istian Coude
r
r
e
place_object: don't check r
e
ad_replace_
r
efs twice
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ri
s
tian
C
ou
d
er
ren
a
me
R
E
AD_SHA1
_
FILE_
R
EPL
A
CE flag to LOOKU
P
_REPL
A
C
E_OBJECT
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-05
Christian Co
u
der
strbuf: remove prefix
c
mp(
)
and suffixcmp(
)
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-05
C
h
r
istian Couder
re
p
lace
{
p
re,suf}fixcm
p
() with
{
s
ta
r
ts,ends}_with()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-05
Ch
r
istian Coud
e
r
strbuf: in
t
roduce star
t
s_w
i
th(
)
and ends_with()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-05
C
h
r
i
stian
C
o
u
d
er
buil
t
in/remote: remove
p
ostfixc
m
p() and use suffixcmp
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-05
Ch
r
istian Couder
enviro
n
ment: normali
z
e use of
p
ref
i
x
c
m
p() by removing
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-10-28
C
h
r
i
s
t
ian Couder
sha1
_
fil
e
: move co
m
m
ent about re
t
urn v
a
lu
e
where i
t
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Ch
r
istian
C
ouder
t6050-repl
a
c
e
:
use
s
ome long o
p
tion names
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
C
hristia
n
Couder
replace:
a
l
low long o
p
ti
o
n names
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
Documentati
o
n/replace
:
add
C
re
a
ting
Replacement O
b
jec
t
s
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Ch
r
isti
a
n Couder
t
6050-replace:
a
dd test
to clean up all the replace
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
C
h
ristian Couder
t605
0
-r
e
pl
a
ce: test that o
b
j
ects a
r
e
of the same
type
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Christian Co
u
der
D
o
c
umentation
/
replace: state
th
a
t objects must be o
f
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Christian Co
u
der
re
p
la
c
e:
forbid replacing a
n
objec
t
w
ith one of a different
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-01-30
Chri
s
tian
C
ouder
g
itk: Ignore gitk-wish
buil
d
pro
d
uc
t
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-01-10
Christian Couder
M
a
kef
i
le: detect when PYT
H
ON_
P
AT
H
changes
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2012-12-25
C
h
ristian
C
o
ude
r
M
a
k
efile:
replace "echo 1>
.
.
.
" with "ec
h
o >
.
.
.
"
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2012-12-19
Christian Couder
M
akefile: repl
a
ce
"
e
c
ho 1>
.
.
.
"
with "echo >
.
.
.
"
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2012-12-19
Christ
i
an Coude
r
Mak
e
f
ile: detect when PYTHON_PATH
c
hanges
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2012-12-18
Chri
s
tian Couder
M
a
kefile: rem
o
v
e
tracking of TC
L
TK_PATH
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2012-04-22
Christian Couder
reve
r
t
: add missing va_end
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2011-09-21
Christian C
o
uder
bisect: fix exiting when
checkout
f
ailed in
bisect_start()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-09-27
Christian Couder
t
6050 (replace): fix bogus
"
fetch
br
a
nch with
replacement
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
Chri
s
tian Co
u
de
r
blame: use find_co
m
mit_subje
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
merge
-
recursive: use find_commit_subject() in
s
t
ead
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
Christian C
o
u
d
er
bisect:
u
se
f
ind_commit_subject() i
n
stead of custom
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
Ch
r
istian
C
ouder
reve
r
t:
ren
a
me variables related to
subject in get_message()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
Christian Cou
d
er
rever
t
: refactor code to find co
m
mit subject in find
_
commit_
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
Christian Co
u
d
e
r
r
evert:
f
i
x of
f
by one re
a
d when searc
h
ing t
h
e end
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
Christia
n
Couder
t350
8
: ad
d
check_head_differ
s
_fr
o
m() helper functi
o
n
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-16
Christian Couder
revert: improve succes
s
m
e
s
s
age by adding abbreviated
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-16
Christia
n
C
o
uder
revert:
d
on't pr
i
nt "Finishe
d
one cherr
y
-
p
ick
.
" if
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-16
Christian Couder
rev
e
rt: refa
c
tor comm
i
t co
d
e
in
t
o
a
new run_g
i
t_
c
ommit
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-16
Christian Co
u
der
rever
t
: report success when using
optio
n
-
-
strategy
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-25
Chri
s
tian Couder
Do
c
umentation: grep: fix asc
i
idoc proble
m
w
ith -
-
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-25
Christian Coud
e
r
revert:
accep
t
arbitrary rev-
l
i
s
t options
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-13
Christia
n
C
o
uder
commit: use value of
GIT_REFLOG_ACTION env va
r
iable
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-06
Christian Couder
diff: fix "gi
t
show -C -C"
o
utput
w
hen renaming a binary
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
C
hri
s
tian Couder
Do
c
umentation/revert:
d
esc
r
i
b
e passing more than
o
ne
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
Chris
t
ian Couder
Documentation/cherry-pick: describe passing more
t
han
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
Christian Couder
revert: add tests to c
h
e
ck cherry-picking
many commi
t
s
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
Chr
i
sti
a
n C
o
uder
revert: allow cherry-
p
icking more
t
h
an one commit
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
Chr
i
stian Couder
r
evert:
c
hange help_msg
(
) to t
a
ke no argument
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
C
h
ristian
C
ouder
revert: r
e
fact
o
r
code into
a
do_pick_commit() fun
c
tion
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
Ch
r
istian Couder
r
e
vert: use run_command_v_opt()
instead of execv_git_cmd()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
Christian Coude
r
revert: cleanu
p
code for -x
option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-04-01
Chri
s
tian
C
ou
d
er
revert: add
"--stra
t
e
g
y" option to
cho
o
se merge st
r
ategy
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-04-01
Chris
t
ian Couder
merge: make fun
c
tion t
r
y_me
r
ge_command non static
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-04-01
C
h
ristian Couder
merge: refact
o
r code that c
a
lls
"
gi
t
merge-STRATEGY"
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-04-01
Christia
n
Coude
r
rev
e
rt: refactor
m
er
g
e recursive co
d
e into i
t
s
o
w
n
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-04-01
Christian Co
u
der
rev
e
rt: use strbuf to refa
c
tor the c
o
de
th
a
t w
r
ites
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-20
Ch
r
istian C
o
uder
r
eba
s
e -i: use
new
-
-ff
c
h
erry-pick opt
i
on
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-07
Christian Co
u
der
Documentation: describe new che
r
r
y
-pick --ff
o
ption
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-07
Chr
i
stian Couder
cherry-pick: add tests
f
or new --ff option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-07
Christia
n
Co
u
der
r
e
s
e
t: disall
o
w using --keep when
there are unmerged
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-07
C
hristian
C
ou
d
er
r
eset: disallow "re
s
et --keep" outside a work tree
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-07
Christian C
o
uder
Documentation:
re
s
et: describe
ne
w
"--keep"
option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-01
Christian Couder
b
i
sect
:
e
r
ror
o
ut when passing b
a
d
pat
h
parameters
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-25
Christia
n
C
o
uder
reset: add test
c
ases
f
or "--keep" option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-25
C
hristian Couder
rese
t
: add
option "--keep" to "git reset"
Mentored-by: Christian Couder <
chriscool@tuxfamily.org
>
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-23
Christian C
o
u
der
Documentatio
n
: rev-list: fix synopsys
f
or -
-
ta
g
s a
n
d
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-16
Chri
s
tian Couder
t7
1
1
1
:
fi
x
b
ad HEAD in tests with
u
nmerged entrie
s
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
next