repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/notes-merge-config'
2015-08-26
Chr
i
stian Couder
trailer: retitle a test and
c
o
rrect an in-comme
n
t
m
e
ssage
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-21
Ch
r
isti
a
n
C
ou
d
er
trailer: ignor
e
first line of
m
essage
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Chris
t
ian
Couder
bisect: add test
t
o
c
h
eck that revs a
r
e
p
roperly parsed
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Christi
a
n Co
u
der
bisect: parse revs before p
a
s
s
ing th
e
m to che
c
k
_
e
x
pected_revs()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Ch
r
is
t
i
an Couder
t
r
a
iler: add test with an
old style conflict block
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
trai
l
er: reuse ignore_non_trai
l
e
r() to ign
o
re conflict
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Ch
r
i
stia
n
Couder
commit: ma
k
e ignore_non_t
r
aile
r
(
) non static
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Ch
r
is
t
ian Couder
trailer: d
i
splay a trailer witho
u
t its trai
l
ing newline
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian
Couder
trai
l
er: i
g
nore
c
omment li
n
es inside the trailers
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
s
ti
a
n Co
u
der
Do
c
um
e
ntatio
n
:
a
d
d docume
n
ta
t
ion for '
g
i
t
i
n
terpret
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
i
stian
C
ou
d
er
tr
a
iler: add t
e
sts
f
or
comman
d
s in config file
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Coude
r
t
r
ailer: execute command from 'trailer
.
<name>
.
command'
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an
Couder
t
r
ailer: add tests fo
r
"
g
it in
t
erpret-trailers"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christi
a
n Couder
trailer: add interpret-t
r
a
ilers comman
d
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Coud
e
r
t
r
ailer: p
u
t
all
the pr
o
cessing together
and print
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christ
i
an
C
o
ud
e
r
trai
l
e
r
:
parse
t
railers
from
f
ile or stdin
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian
C
o
u
der
tr
a
iler: process command li
n
e tr
a
i
ler arg
u
ments
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
hristi
a
n Couder
trailer: read and process con
f
ig information
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: proc
e
ss
tr
a
ilers from inpu
t
message and
arguments
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Ch
r
istia
n
Couder
trailer: add da
t
a structu
r
es and basic
function
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
h
ristian Cou
d
er
r
eplace: add test for --graft with a merg
e
tag
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
h
ris
t
ian Co
u
d
e
r
r
e
place: che
c
k mergetags when using --graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
hri
s
tian C
o
uder
replace: add test
f
or --g
r
aft with
si
g
ned commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
h
ristian Cou
d
er
r
epl
a
ce: remove signa
t
ure w
h
en us
i
ng --
g
raft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
contrib: a
d
d conve
r
t-gr
a
fts-to-rep
l
ace
-
r
e
fs
.
s
h
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
h
rist
i
an Couder
Docu
m
ent
a
t
ion: replace:
a
d
d --graft opt
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian
C
ouder
replace
:
a
d
d test f
o
r --gr
a
f
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
hrist
i
an C
o
uder
replace:
a
d
d
--graft op
t
ion
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Christian
C
oude
r
replac
e
:
cleanu
p
redi
r
ection style in
test
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Chri
s
tian
C
ouder
c
ommit: add for_eac
h
_merg
e
t
ag()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
C
hri
s
tian Couder
Documen
t
a
t
i
on: rep
l
ace: descr
i
be new --edit o
p
tion
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
replace: a
d
d --edit
to usage string
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
C
h
r
i
s
t
ian Co
u
der
r
e
p
l
a
c
e: add tes
t
s for --edit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian
Couder
r
eplace: d
i
e early if replace ref already exists
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christi
a
n Coud
e
r
replace: refact
o
r
c
hecki
n
g ref validity
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
repla
c
e
:
m
ake sure -
-
edit re
s
ult
s
in a different object
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-30
Christian Couder
re
p
l
a
ce info: rename 'full' to 'long' an
d
cl
a
rify
i
n
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christ
i
a
n
C
ouder
Documen
t
at
i
on
/
git-re
p
l
a
ce: describ
e
--f
o
rma
t
option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
h
r
istian Couder
builtin/repl
a
ce:
unset read_replac
e
_refs
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Ch
r
istian Couder
t6050: add
t
es
t
s for li
s
ting with --format
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
bu
i
ltin
/
repl
a
ce
:
t
e
a
ch
listing usi
n
g
short, me
d
ium
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chri
s
t
i
a
n
Couder
sha1_file: perform object replacement in sha1_obj
e
ct_info_ex
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chris
t
ian Coude
r
t6050: show th
a
t g
i
t
c
at-
f
i
l
e
-
-ba
t
ch
fails
w
i
th r
e
place
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
s
h
a1_object_info_extended
(
): ad
d
an "unsig
n
ed flags
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
C
hri
s
tian Couder
s
ha1_file
.
c: add lookup_replace_object_e
x
tended() to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Coude
r
repla
c
e_object
:
d
on't check r
e
ad_r
e
place_refs twice
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Co
u
der
re
n
ame READ_SHA1_F
I
LE_REPLA
C
E flag to LOOKUP_RE
P
LA
C
E_OBJECT
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Chri
s
tian Coude
r
strbuf:
re
m
ove prefixcmp() and suffixcmp()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christi
a
n
Cou
d
er
repla
c
e {pre,suf}fixcmp() wi
t
h
{
s
t
a
rts,end
s
}_with()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Couder
strbuf:
i
n
troduce
s
t
arts_w
i
th() an
d
e
n
ds_
w
ith()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Chr
i
stian Coud
e
r
builtin/remote:
re
m
ove
post
f
ixc
m
p() and
u
se suffixcmp
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christ
i
an Coud
e
r
envir
o
nment
:
normalize
use of
prefix
c
mp() b
y
removing
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-10-28
Christian Coude
r
sha
1
_file: mo
v
e comment about re
t
urn
value where it
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Ch
r
i
s
tian Couder
t6050-replace: use so
m
e long option
names
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian Coud
e
r
r
epla
c
e
:
a
llow long option na
m
es
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chr
i
stian Couder
Documentation
/
replace: a
d
d Creatin
g
Repla
c
ement Obje
c
ts
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
hristian
C
o
u
d
er
t6050-repla
c
e
:
add test to clean up all the replace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chri
s
tian C
o
uder
t6050
-
re
p
lace: test that objects a
r
e of the same ty
p
e
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
C
hristian
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
Christian Couder
replace: forbid replacing an
o
bject
with on
e
of a d
i
fferent
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-30
Christian Co
u
d
e
r
gitk: Ign
o
re
g
i
t
k-wish buildproduc
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-10
C
hrist
i
an Couder
Make
f
i
le: detec
t
when PYTHON_P
A
T
H changes
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-25
Christian Couder
Makefile:
r
ep
l
ace "
e
cho 1
>
.
.
.
" with
"echo >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
Christia
n
Coud
e
r
Makefile: replace "ec
h
o 1>
.
.
.
" w
i
th "echo >
.
.
.
"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-19
C
h
ristian C
o
u
der
Makefile: detect w
h
en PYTHON_PAT
H
changes
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-12-18
C
h
r
isti
a
n Coud
e
r
Makefile: remove tracking of
TCL
T
K_P
A
TH
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2012-04-22
C
h
ristia
n
Couder
revert: add missing va_end
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2011-09-21
Ch
r
isti
a
n Couder
bisect: fix exiting wh
e
n checkout failed in bi
s
ec
t
_sta
r
t
()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-09-27
Chri
s
tian Couder
t6050 (repl
a
ce): fix b
o
g
us "fetch branch with replacement
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Chr
i
stian
Couder
blame:
use
f
ind_commit_su
b
ject(
)
ins
t
ead
o
f custo
m
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christ
i
an Coud
e
r
merge-recursive: use find_com
m
it_subjec
t
() instead
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian C
o
uder
bisect:
use find_commit_subj
e
ct() instead of custo
m
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
rev
e
r
t:
re
n
am
e
va
r
iables re
l
ated t
o
subje
c
t
i
n
get_m
e
ssage()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Chr
i
stian Coud
e
r
reve
r
t: refactor code to find commit su
b
ject in find_commit_
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Coud
e
r
revert: fix off by on
e
read when searching
the
e
n
d
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-23
Christian Couder
t3508: add c
h
eck_head_diff
e
rs_from() helper function
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian C
o
u
d
er
rev
e
rt: im
p
rove
s
u
ccess
m
ess
a
ge
b
y adding abbreviated
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian
Couder
reve
r
t: do
n
't print "Finishe
d
one cherry-pick
.
"
i
f
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian
Couder
revert:
refactor
commit code in
t
o a new r
u
n_git_commit
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-07-16
Christian
Couder
revert: repor
t
success when using option --strategy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Chri
s
tian
Couder
Documentation:
g
rep: fix asciidoc prob
l
e
m
with --
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-25
Christian Couder
re
v
ert:
a
cce
p
t arbitrary rev-list opt
i
on
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-13
Christian Couder
commi
t
:
use value of
GIT_REFLOG_ACTION env
variable
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-06
Ch
r
istian C
o
uder
d
i
ff: fix "git sho
w
-C
-
C" output whe
n
renamin
g
a binary
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Couder
D
ocume
n
t
ation/
r
e
vert: desc
r
ibe passing more than
o
ne
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christi
a
n Couder
Doc
u
m
entation/cherry-pick: describe p
a
s
s
ing more
than
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Coud
e
r
reve
r
t: a
d
d tests to che
c
k
c
her
r
y
-picking many commits
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Couder
re
v
ert: allow cherry-picking mor
e
th
a
n o
n
e commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Chri
s
t
i
an Couder
revert: change help_msg() to take no argum
e
nt
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
hristia
n
Coud
e
r
revert: ref
a
ctor code into a
d
o_pick_commit() functi
o
n
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
Christian Couder
revert: use
ru
n
_
command_v_opt() instead of execv_g
i
t_cmd()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-06-02
C
h
ristian Cou
d
er
r
e
vert: cleanup code f
o
r -x op
t
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christia
n
Couder
r
e
v
e
rt: add "--strateg
y
"
op
t
i
on to cho
o
se merge s
t
rategy
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Ch
r
is
t
i
a
n Couder
merge:
make
functio
n
try_merg
e
_co
m
mand no
n
static
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christi
a
n Couder
merge:
r
ef
a
ctor
code that call
s
"g
i
t merge-STRATEGY"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christ
i
an Coud
e
r
r
ev
e
rt: refactor merge recursive code into its own
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-04-01
Christian Couder
reve
r
t: use strbu
f
to refact
o
r the
c
ode that writes
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-03-20
Chr
i
stian Couder
rebase -i: use new --
f
f cherry-pick
o
ption
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-03-07
C
h
ristian Couder
Docume
n
tation: describe new che
r
ry-pic
k
--ff option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2010-03-07
Christian Couder
cherry-pick: add tests
for
new --ff option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
next