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
Merge branch 'js/difftool-builtin'
2016-06-01
Ch
r
istian Cou
d
er
builtin/apply: move 'allow_overlap' global in
t
o 'struct
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-06-01
Christia
n
Couder
built
i
n/apply: move 'updat
e
_index' g
l
obal into
'struct
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-06-01
Ch
r
ist
i
an
C
ouder
bui
l
tin/
a
pply: mo
v
e 'apply_verbose
l
y' g
l
obal into
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-06-01
Christi
a
n
C
ouder
b
uiltin
/
apply: move 'appl
y
_
w
ith_re
j
ec
t
'
global into
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-06-01
Chr
i
stia
n
Coude
r
buil
t
in/apply: mov
e
'apply_in_rev
e
rse' global i
n
t
o
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-06-01
Christian Couder
bui
l
tin/a
p
ply: mo
v
e 'check_ind
e
x' glob
a
l i
n
t
o
'struc
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-06-01
Chri
s
tian Couder
buil
t
in/apply: move
'
check' glo
b
al i
n
to 'struct apply_state'
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-06-01
Ch
r
istia
n
C
oude
r
builtin/apply: move '
u
nidiff
_
zero' global
in
t
o 'struct
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-06-01
Chri
s
t
i
an
Co
u
der
builtin/apply: move 'state
'
init
i
nto init_apply_state()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-05-12
Christian
Co
u
der
b
u
i
l
tin/apply: introduce 'struct apply_stat
e
' to sta
r
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-05-12
Christi
a
n Couder
builtin
/
apply: mo
v
e
'
r
e
ad_stdin' gl
o
bal into
c
m
d_apply()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-05-12
C
hristian Couder
b
u
il
t
in/apply: move 'opti
o
ns' variab
l
e into cmd_apply()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-05-12
Christian Couder
builtin/apply: extra
c
t line_by_line_
f
uzzy_match(
)
f
rom
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-05-12
C
h
ri
s
tian Coud
e
r
b
uiltin/apply: avoid
l
o
c
a
l variable shadowing 'len
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-05-12
Chris
t
i
an C
o
uder
built
i
n
/ap
p
ly: avoid param
e
ter shadowing 'linenr' global
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-05-12
Christia
n
Couder
builtin/apply: avoid pa
r
a
m
eter shadowing 'p_value'
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-05-12
Ch
r
i
s
tian Couder
builti
n
/appl
y
: make gitdiff_verif
y
_name() r
e
tu
r
n
v
o
id
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-05-08
Christian Couder
Git/SVN
:
die when there is n
o
commit met
a
data
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-04-01
Christian Couder
builti
n
/app
l
y: fr
e
e patch w
h
en par
s
e
_
ch
u
n
k() fail
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-04-01
Christia
n
Couder
builtin/appl
y
:
h
a
ndle
pa
r
se_binary()
fai
l
ure
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-03-22
Chris
t
i
an Couder
builtin/apply: get
r
id of
u
se
l
ess
'
n
ame'
v
a
r
iable
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-03-07
Christian Couder
Documentation: talk about page
r
in api-tr
a
ce
.
txt
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-01-27
Christi
a
n Coude
r
t706
3
:
a
d
d tests for core
.
unt
r
ackedC
a
che
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-01-27
Christian Couder
test-dump-untra
c
ked-cac
h
e: don't mod
i
fy the
untra
c
ked
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-01-27
Christian C
o
uder
config: add core
.
u
n
trackedCache
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-01-25
Christian Couder
dir: simp
l
i
f
y
untrack
e
d cache
"ident" fiel
d
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-01-25
Chris
t
i
an Cou
d
er
dir: add remove_untracked_ca
c
he()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-01-25
Ch
r
istian Co
u
d
er
dir: add {new,add}
_
untracked_cache()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-01-25
Christian Couder
update-index
:
move
'
u
c' var de
c
l
a
r
ation
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-01-25
Chr
i
stian
C
o
u
der
update-inde
x
: add
untr
a
c
k
e
d
cache notifications
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-01-25
Christian
C
ouder
u
pdate-inde
x
:
add --te
s
t-untracked
-
cache
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2016-01-25
Christian Couder
up
d
a
te-
i
ndex: us
e
enum
fo
r
untr
a
cked ca
c
he options
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-12-29
Christian Coud
e
r
dir: free untracked ca
c
he
w
hen removing it
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-12-10
Christi
a
n Couder
Doc
u
m
entation/git-update-index: add missing opts to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-11-24
Christ
i
an
C
ouder
Documentation/gi
t
-
update-
i
nde
x
: add
m
issing o
p
ts
t
o
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Christian C
o
ude
r
quote: move comment bef
o
re sq_quote_b
u
f()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-10-07
Christian Couder
quote
:
fix broken sq_quote_
b
u
f
() rela
t
ed com
m
ent
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2015-08-31
Christia
n
Co
u
d
er
traile
r
: supp
o
rt
m
ultiline title
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-26
Christian Couder
trailer: re
t
itle
a
tes
t
and
correct an in-c
o
mment
message
Signed-off-by:
Christian Couder
<christian.couder@gmail.com>
commit
|
commitdiff
|
tree
2015-08-21
Ch
r
istian Couder
trail
e
r:
i
gnore firs
t
l
i
ne of message
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Christian Couder
b
is
e
ct
:
add tes
t
to c
h
eck that rev
s
a
re p
r
o
p
erly parse
d
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-12-29
Christia
n
Couder
bisect: parse revs
b
e
f
ore passing
t
hem
t
o check_expe
c
ted_revs()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christi
a
n
C
o
uder
traile
r
: add test wit
h
an old style c
o
nflict block
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Cou
d
e
r
tr
a
ile
r
: reus
e
ignore_non_trailer()
to ignore c
o
n
f
l
i
c
t
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Couder
commit: make
ignore_non_trailer()
n
on static
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian Co
u
der
trailer: display a
t
ra
i
ler without
i
ts trailing newline
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-11-10
Christian
C
ouder
trailer: ig
n
o
r
e comment
l
ines i
n
side the trailers
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
Docum
e
ntation: add docu
m
entation for 'g
i
t int
e
rpret
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian
C
o
u
der
t
r
ailer: add
t
e
s
ts
f
or comma
n
ds in
c
o
nfig file
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian
C
oud
e
r
trailer: execute command from 'trail
e
r
.
<name>
.
command'
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian C
o
uder
trailer:
a
dd t
e
sts
f
or
"git in
t
erpre
t
-tr
a
i
lers"
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Co
u
der
trai
l
er: add int
e
rpret-trailers command
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chr
i
stian Couder
trailer: put all th
e
proces
s
ing together and print
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
C
hristian Couder
trailer: pa
r
se trailers f
r
o
m
f
i
le or stdin
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christia
n
Couder
trailer: process co
m
m
a
nd line trailer
a
r
gument
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Couder
trailer: r
e
ad and process config information
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Christian Cou
d
er
trailer: process
t
r
ailers from i
n
p
ut me
s
sage
and argum
e
nts
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-10-13
Chri
s
tian Co
u
der
t
r
ail
e
r: add data
structures and basic functions
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christ
i
an Couder
replace: a
d
d test fo
r
--graft with a mergetag
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
C
hristia
n
C
ouder
replace: c
h
eck merget
a
gs when using --graf
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christ
i
an Couder
replac
e
:
a
dd test for
-
-graft with signe
d
commit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Chri
s
tian Couder
replace: remove s
i
gnature when us
i
ng --graf
t
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Cou
d
er
contrib: ad
d
convert-graf
t
s-to
-
replace-refs
.
s
h
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christ
i
an
Couder
Doc
u
m
entation:
rep
l
ace: add --graft option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
replace: add
test fo
r
--graft
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-21
Christian Couder
r
epl
a
ce: add --graft
opti
o
n
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Christian
Couder
repl
a
ce: cleanup redirecti
o
n
style in tests
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-07-07
Chri
s
tian Couder
commit: add for_each_merge
t
ag()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
Documentati
o
n: re
p
la
c
e:
d
escri
b
e n
e
w --edit op
t
i
on
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian
Couder
rep
l
ace: add --edit to usage string
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
re
p
lace:
add
t
ests fo
r
--edit
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Coude
r
replace
:
die ear
l
y if re
p
lace
r
ef already exist
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Christian Couder
replace:
r
efac
t
or checking ref val
i
di
t
y
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2014-05-19
Chr
i
s
t
ian
Couder
replace: make
s
u
r
e
--edit results in
a
different object
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-30
Christian Cou
d
er
replace
info: rename 'full' to 'lon
g
' an
d
clarify in
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
Documentation/
g
i
t-
r
eplac
e
: describe --
f
or
m
a
t
option
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
bui
l
tin/replace:
u
n
set
r
ead_rep
l
a
ce_refs
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chris
t
ian Couder
t6050: add tests fo
r
listin
g
wit
h
--format
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Coud
e
r
b
u
ilti
n
/repl
a
ce
:
te
a
ch
l
isting
using s
h
o
r
t
, medium
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian Couder
sha1_
f
i
le: perfor
m
obj
e
ct repl
a
c
ement in sha1
_
object_i
n
fo
_
ex
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Christian
C
oude
r
t6050: show t
h
at git cat-file
-
-batch fa
i
ls
with replace
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chri
s
ti
a
n C
o
uder
sha1_objec
t
_info_extended(): add an "unsigned flags
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Ch
r
is
t
ian Couder
s
ha1_file
.
c:
a
dd lookup_replace_obje
c
t_exte
n
d
e
d() to
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-12
Chris
t
ia
n
Coude
r
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
Ch
r
istian Couder
rename
R
EAD_SHA
1
_FILE_REPL
A
CE flag to LOOKUP
_
REPL
A
CE_OBJECT
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
C
h
r
is
t
ia
n
Co
u
der
st
r
b
u
f: r
e
move prefixcmp(
)
a
n
d
suffixcmp
(
)
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christ
i
a
n Couder
repla
c
e {pre,su
f
}fixcmp() wi
t
h {starts,ends}_with()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Chris
t
ian Couder
st
r
buf: introduce s
t
arts_with() and ends_wit
h
()
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Couder
builtin
/
remote: remo
v
e p
o
stfixcmp() and us
e
suffixcmp
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-12-05
Christian Couder
environment: normaliz
e
use
o
f p
r
efixcmp() by remov
i
ng
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-10-28
Chri
s
tia
n
Cou
d
er
sh
a
1_fil
e
:
move com
m
e
n
t
about r
e
turn v
a
lue
where it
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
t6050
-
replace: use some l
o
ng option name
s
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chr
i
s
t
ian Co
u
der
replace
:
allow lo
n
g option na
m
es
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chri
s
tian Couder
Documentation/replace: a
d
d
Cre
a
ting Replacemen
t
Objects
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Chr
i
stian Coude
r
t605
0
-repla
c
e:
add test to c
l
ean up all the replac
e
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christ
i
an Couder
t60
5
0-replac
e
: test that objects are of the same type
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
Documentation
/
r
eplace: state that ob
j
ects must be o
f
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-09-06
Christian Couder
replace: f
o
rbi
d
r
eplaci
n
g an object with one of a differ
e
nt
.
.
.
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-30
Christian Couder
gitk: Ign
o
re git
k
-wish
b
ui
l
dproduct
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
2013-01-10
C
h
ristian Couder
M
a
kefi
l
e:
detect when PYTH
O
N
_PATH c
h
anges
Signed-off-by:
Christian Couder
<chriscool@tuxfamily.org>
commit
|
commitdiff
|
tree
next