repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
sample pre-commit hook: use --bool when retrieving config var
2013-09-24
Joha
n
Herland
sampl
e
pre-
c
ommit hook
:
use --bool when retriev
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erland
t3200: Add test demonst
r
at
i
n
g minor regression in 41c
2
1f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
ohan H
e
rland
Ref
e
r to branch
.
<
n
a
me>
.
r
e
mote/merge when do
c
umenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herlan
d
t3200: Minor fix w
h
en
p
r
eparing for track
i
ng fail
u
re
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
nd
t2024: Fi
x
&&-chaining and a coupl
e
o
f typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
Herl
a
nd
Move create
_
no
t
es_co
m
m
it
(
)
f
r
om notes-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
land
Move copy_note_for
_
rewrite + friends from buil
t
in/note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_copy_
n
otes_for_rewrite():
Let calle
r
p
r
o
v
ide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
glossary: Upda
t
e a
n
d
reph
r
a
se th
e
defin
i
tion
of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
branch
.
c: Va
l
idate trackin
g
branches wit
h
refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t9114
.
2: D
o
n
'
t
use --track o
p
tion
a
gainst "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t72
0
1
.
24:
A
dd
refspec to keep --trac
k
working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
t3
2
0
0
.
39: trackin
g
s
e
t
up s
h
o
u
ld
fail
if the
r
e is
no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Her
l
a
nd
check
o
ut: Use rem
o
te ref
s
p
e
cs
w
h
en DWIMming trackin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Show failure to u
s
e
refspec when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herla
n
d
t2
0
2
4
:
A
dd t
e
sts verifying curr
e
nt DWIM behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herland
git symboli
c
-ref --delete $symre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Her
l
and
F
i
x failure to d
e
lete a packed ref through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n
Herl
a
nd
t1400-update-r
e
f:
A
dd
test ver
i
fyi
n
g bu
g
with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
n
o
t
es-merge: Don't remove
.
gi
t
/
N
OTES
_
MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n Herland
notes-
m
erg
e
: use o
p
end
i
r/readdir i
n
stead of using
re
a
d_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Her
l
and
t3310:
il
l
u
strate
f
ailure to "not
e
s merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
fast-impor
t
: Fix incorrect fano
u
t level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an He
r
land
t9
3
01: Add
2
nd testcase ex
p
osing bugs in f
a
st-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herlan
d
t9301: Fix
t
estcase covering up
a
bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n Herland
t5
4
00: Fi
x
a
c
o
uple of ty
p
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Mark dirs
t
at
er
r
or messag
e
s
for
translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve error handli
n
g when parsing
dirstat
para
m
eters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
New --dir
s
tat
=
lin
e
s m
o
de, doing dir
s
tat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
l
l
ow sp
e
cifying --dirstat cut-off
pe
r
c
e
ntage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
c
o
nfig variable fo
r
sp
e
cif
y
ing default --
d
i
rstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Refactor --dirstat
p
ars
i
ng; deprecate -
-
cumulati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n Herland
Make --dirstat=0 output
d
ir
e
cto
r
ies
t
hat contri
b
ute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Add sev
e
r
al testcases for --di
r
s
tat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
a
n
Herlan
d
-
-
dirsta
t
:
I
n c
a
se of ren
a
mes, use tar
g
et filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
Teach --
d
i
rstat not to complete
l
y ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Her
l
a
nd
--dirstat-by
-
f
i
le: M
a
ke
it faster
a
nd more cor
r
ect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
--dirstat: D
e
scribe non-obv
i
ous differences
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an Herla
n
d
M
a
ke
"g
i
t no
t
es add" mor
e
user-frie
n
dly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n Herland
lo
g
/pretty-
o
ptions: Document --
[
n
o
-]notes an
d
deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joh
a
n
H
erland
branch/
c
h
eckout --track
:
Ens
u
r
e
that ups
t
ream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
pus
h
.
defa
u
lt: Rename
'
tracking' to
'upstre
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
rovide 'git me
r
g
e --
a
bort'
a
s
a
synon
y
m to
'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
c
md_merge
(
): Parse o
p
t
ions before
c
he
c
ki
n
g MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
He
r
land
Provide 'git notes
get-ref'
to easily
r
etrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
git notes merge:
A
dd te
s
tcases for merging
n
otes tre
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes merge: Add
a
n
o
ther auto-r
e
solvi
n
g s
t
rategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: --commit should fail
i
f underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merge: List co
n
f
l
ic
t
ing notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git n
o
t
es merge: Manu
a
l con
f
lict resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes merge:
M
anual
c
onf
l
ic
t
reso
l
ution,
p
art 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
D
ocumentat
i
on: Preliminary docs on 'git
n
otes m
e
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
n
otes m
e
rge: Add automatic c
o
nflict
resolver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git
no
t
es merge: Handle r
e
a
l
, non-co
n
flicting
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Refactor creation of note
s
commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes m
e
rge: Initial impleme
n
tation
handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
bui
l
t
i
n/
n
otes
.
c
: S
p
lit notes ref DW
I
Mmery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
notes
.
c: Use two
n
ewlines (in
s
te
a
d
of one
)
wh
e
n concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
(trivial) t3303: Indent with tabs i
n
stead of
s
p
aces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
a
nd
notes
.
h/c: Propagate
combin
e
_no
t
es
_
f
n
return val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
n
o
t
es
.
h/c: Allow comb
i
n
e_notes functions t
o
r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
c
:
Reorder functions
in pre
p
arati
o
n for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
H
e
rland
note
s
.
h
:
Make default_notes_ref() available
i
n notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
Herland
(trivial) notes
.
h: Min
o
r docu
m
entation fixes t
o
c
o
p
y_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erl
a
nd
notes
.
c
:
Hexify SHA1 i
n
die() messa
g
e from in
i
t_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Do
n
't
c
re
a
te (emp
t
y) commit w
h
en
remov
i
ng
n
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
e
r
lan
d
Enable custom schem
e
s for column
c
olo
r
s in the
gr
a
ph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Ma
k
e g
r
ap
h
_
n
ext_line()
availabl
e
in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herla
n
d
rev
i
s
i
on: Turn o
f
f history simplification in --an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
revision: Fix typo in --ancestry
-
path
e
rr
o
r message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Her
l
and
D
o
c
umentation/rev-list-options
.
txt: Explain --ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
Docume
n
tation/rev-list
-
o
ption
s
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c
: E
n
sure "
i
n
d
ex $from
.
.
$to" line contains unam
b
i
guou
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Joh
a
n Herland
builtin-notes: Minor (mostly pars
e
_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
s
ubmodule summary
:
Don't barf when invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d "copy" subcommand
f
o
r
c
opying
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
builtin-notes: Mis
c
.
refacto
r
ing of argc and
e
xit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
builtin-notes
:
Add -c
/
-C options for
reusing not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
notes: R
e
f
a
ctor handling of -F option
t
o
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
bu
i
ltin-notes:
De
p
recate the -
m
/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
H
e
r
l
and
builtin-note
s
: Add "append
"
subcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
e
r
la
n
d
bu
i
l
t
i
n-
n
ote
s
: Add "add
"
sub
c
ommand for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-
n
o
tes: Add --message
/
--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
bu
i
ltin-notes:
Add "list" subcommand
for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Do
c
umen
t
ati
o
n: Genera
l
ize git
-
n
o
tes docs to
'
ob
j
ec
t
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes
:
Add "
p
rune" sub
c
ommand for remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: p
r
une_notes():
P
rune notes that b
e
long to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: V
e
rify
t
hat
removing notes
t
rigg
e
r
s automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add "remove"
subcomm
a
nd
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach buil
t
in-
n
otes to remove emp
t
y
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
T
ea
c
h not
e
s code
to properly pr
e
serve
n
o
n
-
n
otes
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
t3305: Verify that adding many n
o
te
s
wit
h
git-n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
t3301: Ver
i
fy
s
uccessful ann
o
tation of non
-
c
o
m
mits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Buil
t
in-i
f
y git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herlan
d
Refactor notes co
n
c
at
e
natio
n
in
t
o
a
flexible interfa
c
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes AP
I
:
A
l
low multiple c
o
ncurrent notes tr
e
e
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API
:
write_notes_tree(): Sto
r
e
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
Notes API:
f
or_each_note(): Traverse the en
t
ire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API: get
_
note(
)
: Return t
h
e note annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes
A
PI: re
m
ove
_
note(): Remove note
objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next