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: process command line trailer arguments
2014-10-13
Chr
i
stian
Co
u
der
trailer
:
process c
o
mmand line trailer argum
e
nts
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
tian
C
ouder
trailer: r
e
a
d and
p
r
ocess
conf
i
g
information
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
C
hristian Couder
t
raile
r
: process trailers from input
m
essage
and arg
u
ments
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Co
u
der
trailer
:
add
data
s
truc
t
ures and b
a
sic
functions
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christ
i
an Couder
replace
:
a
dd test for --
g
raft with a mer
g
e
t
ag
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Ch
r
istian Couder
replace: check merg
e
t
ags when using --graft
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christi
a
n Coud
e
r
replace: add test
f
or --graft with
s
igned com
m
it
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christian Coude
r
replace: remove
signature when using --graft
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christian Coude
r
c
o
ntrib: add convert-grafts-to-replace-refs
.
sh
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christian Cou
d
er
Documentati
o
n:
r
eplace:
add
-
-graft option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Christian Coud
e
r
r
e
place: add test fo
r
-
-
gr
a
ft
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-21
Chris
t
ian
C
ou
d
er
replace: add --graft o
p
tion
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-07
Christian Couder
replace: cleanup
r
edi
r
ection styl
e
i
n
tes
t
s
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-07-07
Ch
r
istian
C
o
u
der
commit: add
for_each_mer
g
etag()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Ch
r
i
s
tian
C
ouder
D
o
cumen
t
ation: repla
c
e
:
d
e
scri
b
e new
--edit option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
C
hrist
i
an Couder
repl
a
c
e
:
a
dd --e
d
it to usage s
t
ring
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Christ
i
an Couder
rep
l
ac
e
: a
d
d te
s
ts for --edit
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
r
eplace
:
die early if
r
e
p
lace r
e
f
already exists
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Chris
t
ian
C
o
uder
r
epl
a
ce: refactor chec
k
ing ref vali
d
ity
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2014-05-19
Christi
a
n C
o
uder
replace: m
a
ke sure --edit results in a different
o
bject
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-30
Christ
i
a
n
Cou
d
er
rep
l
ace info: renam
e
'full'
to 'long' and clarify in
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Chr
i
stian Coud
e
r
Documentation
/
git-replace: describe --forma
t
option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ristian Co
u
der
b
u
ilt
i
n/replace: unset
read_replace_refs
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
C
h
rist
i
an Couder
t6050: add tests for li
s
t
i
ng
w
it
h
--format
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Christian
C
ouder
builtin/replace
:
t
each listing using short, medium
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
s
h
a1_file: perform object replacement i
n
sha1_object_info_e
x
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
C
hrist
i
a
n
C
oud
e
r
t60
5
0: show that git cat-file --
b
atch fails wit
h
repl
a
ce
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
C
h
ri
s
t
ian Couder
sha1_o
b
ject_info_exte
n
ded(): add an "unsigned fla
g
s
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Christian Cou
d
er
sha1_file
.
c: add looku
p
_
replace_object_extended() to
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
r
e
place_object: don't check
read_replace_refs twice
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
re
n
a
me
R
EAD_SHA1_F
I
L
E_REPLACE fl
a
g
t
o L
O
O
K
U
P
_REPLACE_OBJECT
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-05
Ch
r
istian C
o
ud
e
r
str
b
uf: remov
e
prefixcmp
(
) and suffix
c
m
p
()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-05
Chr
i
stian Couder
replace {
p
re,
s
u
f}f
i
xcm
p
(
)
wi
t
h {starts,
e
nds}_with()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-05
C
h
ristian Coud
e
r
s
t
rb
u
f: introduce starts_with()
a
nd ends_wi
t
h()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-05
Chri
s
ti
a
n C
o
uder
b
uilt
i
n/
r
em
o
te
:
r
emove
postfixcmp() and
use suffixcm
p
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-12-05
Christian Couder
en
v
ironment: normalize use of prefixcmp() by r
e
m
o
v
ing
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-10-28
Christian C
o
u
d
er
sha1_f
i
le: move comment about
return value where
it
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
t6050-re
p
lace: use some long optio
n
names
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Ch
r
i
stian Couder
repla
c
e: allow l
o
n
g option na
m
es
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
Document
a
tion/replace
:
add Crea
t
ing Replace
m
ent O
b
j
ects
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Christian C
o
u
d
er
t
6050-replace: add test to
c
l
e
an up all the
replace
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Chri
s
tian Couder
t6050-replace: test th
a
t object
s
are
of th
e
sam
e
type
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
Documentation/r
e
place: state that
objects must be o
f
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-09-06
C
h
ristian Couder
rep
l
ace: forbid repla
c
ing
an object w
i
t
h
one o
f
a different
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-01-30
Christian Cou
d
er
gitk: Ig
n
o
re gitk-wis
h
buildproduct
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2013-01-10
Ch
r
istian Couder
M
a
k
e
file:
d
et
e
c
t
w
h
en
PYTHON_P
A
TH ch
a
nges
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2012-12-25
Chris
t
ian Couder
Makefil
e
: replace "echo
1>
.
.
.
" with
"ech
o
>
.
.
.
"
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2012-12-19
C
hristia
n
Couder
Makefile: repl
a
ce "echo 1>
.
.
.
" wit
h
"
echo >
.
.
.
"
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2012-12-19
Christian Couder
Makefile: detect w
h
en PYTHON_
P
ATH cha
n
ges
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2012-12-18
Christian Co
u
der
Makefile: remove tracki
n
g of
T
C
L
T
K
_
P
A
T
H
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2012-04-22
Christian Couder
rev
e
rt: add missing va_end
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2011-09-21
Christian
C
ouder
bisect: fix exiting when
c
heck
o
u
t
failed in bisect
_
start()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-09-27
Chri
s
tian
C
ouder
t6050 (replace)
:
fix bogus "fetch branch with rep
l
acement
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
blame: u
s
e
fin
d
_comm
i
t_subj
e
ct() inst
e
a
d
o
f c
u
st
o
m
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
C
h
ristia
n
Couder
merg
e
-recursive: use find_commi
t
_subject() instead
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
b
i
sec
t
:
use find_
c
ommit_su
b
ject() inste
a
d of custom
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
C
hris
t
ian Cou
d
e
r
revert:
r
ename varia
b
les
r
elated
t
o su
b
j
ect in get_m
e
s
s
a
g
e()
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
Christian Cou
d
er
reve
r
t: refactor code to
fin
d
commit subje
c
t
in find_com
m
it_
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
C
h
ristian Co
u
der
revert: fix off by one read when sea
r
ching the end
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-23
Chr
i
s
tian
Coud
e
r
t3508: add check_head_differs_
f
rom
(
) hel
p
er function
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-16
Christian Cou
d
e
r
revert:
i
m
prove success message by ad
d
i
n
g
a
b
brev
i
a
t
ed
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-16
Christian C
o
uder
revert: don't print "
F
i
nishe
d
one cherr
y
-pick
.
" i
f
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-16
C
h
r
is
t
i
an Co
u
der
revert: ref
a
ct
o
r comm
i
t code
into a new run_git_c
o
mmit
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-07-16
Ch
r
i
stian Coude
r
re
v
ert: report
success when using op
t
ion -
-
strat
e
gy
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-25
Christian Coude
r
D
ocumentation: grep: f
i
x asciidoc problem with --
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-25
Chri
s
tian Cou
d
er
revert: accep
t
arbitra
r
y r
e
v-list option
s
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-13
Christi
a
n Coud
e
r
commit: use value
o
f
GIT_REFL
O
G_A
C
TION env va
r
iabl
e
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-06
C
hri
s
ti
a
n Cou
d
e
r
d
i
f
f
:
f
i
x "git
s
h
ow -C -C" output
w
hen
rena
m
ing a binary
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
C
h
r
ist
i
an Co
u
der
Documentation/revert: describe pass
i
ng more t
h
an
o
ne
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
Chri
s
tian Couder
D
o
cumentation/cherr
y
-pi
c
k: d
e
sc
r
ibe passi
n
g more tha
n
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
Christian Co
u
der
r
evert: add tests to check cherr
y
-picking many commits
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
Christian
Coude
r
revert: all
o
w
ch
e
rry-pi
c
king more than one commi
t
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
C
hristian Couder
revert: change help_m
s
g
(
) to take
n
o argument
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
C
h
ristian Couder
revert: refactor code into
a
do_pick
_
commit() function
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
C
hristian Couder
rever
t
: us
e
run_
c
o
m
mand_v_op
t
() i
n
s
tead
of execv_
g
it_cmd(
)
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-06-02
Chris
t
i
a
n Couder
revert: cleanu
p
c
o
de
f
or -x
option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-04-01
Christia
n
Cou
d
er
revert: add "
-
-stra
t
egy" option to choose merge strategy
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-04-01
Christ
i
an Couder
merge: make funct
i
on try_merge_command non static
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-04-01
Chr
i
st
i
an Couder
merg
e
: refact
o
r code that call
s
"git
merge-
S
TRATEGY"
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-04-01
Chri
s
t
ian
C
ouder
revert:
r
efactor merge recursive c
o
de into its own
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-04-01
Christian Couder
revert
:
use strbu
f
to refactor
the c
o
de t
h
at writ
e
s
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-20
Christian Couder
rebase -i
:
use
new --ff
c
herry-pick
o
p
t
i
on
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-07
Chr
i
sti
a
n Couder
Documentation: describe n
e
w cherry-pick --f
f
option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-07
Christian Coude
r
ch
e
rry-pick: add tests fo
r
n
e
w --ff op
t
i
o
n
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-07
Christian
C
ouder
reset: disallo
w
using --keep
w
hen ther
e
are unmerged
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-07
Christian Cou
d
er
reset: disallow "
r
eset --keep" outside a
work tree
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-07
Christi
a
n C
o
uder
Documentation: reset: desc
r
ibe new
"
--keep"
o
ption
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-03-01
C
h
ristian Couder
bisect: erro
r
ou
t
when pas
s
i
n
g
bad pa
t
h
parameters
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-25
C
hristian Couder
reset: add test case
s
f
o
r
"
--keep" opti
o
n
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-25
C
hristian C
o
uder
r
es
e
t:
a
dd option "--kee
p
" to "
g
it re
s
et
"
Mentored-by: Christian Couder <
chriscool@tuxfamily.org
>
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-23
Christian Couder
Documentation: r
e
v-list: fix synopsy
s
for --tags an
d
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-16
Christia
n
Couder
t7111: f
i
x bad HEAD in
tests wi
t
h unmerge
d
entri
e
s
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-10
C
h
ristian Couder
help: fix configu
r
ed help format
tak
i
ng over command
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-10
Chr
i
s
t
ian Co
u
d
e
r
t
7111: che
c
k th
a
t r
e
s
et option
s
work as descri
b
ed in
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2010-01-05
Chr
i
stian
Couder
D
ocumenta
t
i
on: reset:
a
dd so
m
e
m
issing tables
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2009-12-30
Christian Couder
res
e
t: add a few tests for "git reset --merge"
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2009-12-30
Christian Cou
d
er
Do
c
umentation: res
e
t:
add some tables to descr
i
be the
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2009-12-30
Christian Couder
re
s
et: improve m
i
x
e
d
rese
t
error message when in
a
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2009-12-13
Christian Couder
gitk: Add "--
n
o-replace-objects" option
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
2009-11-24
C
h
ri
s
tia
n
Couder
Documenta
t
i
o
n: u
p
date descriptions of r
e
v
i
si
o
n
opt
i
ons
.
.
.
Signed-off-by: Christian Couder <
chriscool@tuxfamily.org
>
commit
|
commitdiff
|
tree
next
