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
t2024: Fix &&-chaining and a couple of typos
2013-09-09
Johan
H
erland
t2024
:
Fix &&-chaining and a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
g
l
ossary:
U
p
date an
d
rephrase th
e
d
e
finiti
o
n of
a
remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
branch
.
c: Valid
a
te tracki
n
g branches with refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t9114
.
2:
D
on't use --track option against "svn-remot
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t7201
.
24:
Add re
f
spe
c
to
k
eep --t
r
a
ck working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
3
200
.
39: tr
a
cking
s
etup should fail if
t
here is n
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n He
r
land
checkout: Use r
e
mote refsp
e
cs when
D
WIM
m
ing
t
rac
k
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
Her
l
a
n
d
t
2
024: Show failure to use refspec when D
W
IMming r
e
mote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t202
4
: Add t
e
sts v
e
rif
y
ing current
DWIM
b
e
h
av
i
o
r
of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n He
r
land
git
s
ym
b
oli
c
-r
e
f
--delete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herla
n
d
F
i
x
fail
u
re to
delete a packed ref throug
h
a symre
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
t
1400-update-ref: Add test verifying bug with
s
y
mrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n Herla
n
d
notes-merge: Do
n
'
t remo
v
e
.
git/NOTES_MERGE_WOR
K
T
R
EE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han H
e
rland
notes-merge: use opendi
r
/
r
eaddir in
s
tead of u
s
i
n
g read
_
direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
t3310: illustrate failure
t
o "notes m
e
rge -
-
c
o
m
mit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herla
n
d
fast-
i
mp
o
rt: Fix incorr
e
ct fanout level wh
e
n modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
t9301: Add
2nd test
c
ase exposing
b
u
gs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herl
a
nd
t93
0
1:
Fix
t
e
stcase covering up a
b
ug
in fast
-
import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
J
o
han Herland
t
5
400: Fix a
c
ouple of typo
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
M
a
r
k
dirstat
e
rror mess
a
ges
f
or trans
l
a
tion
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herlan
d
Impro
v
e
error handling whe
n
parsing dirsta
t
par
a
meters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
erland
New -
-
dirstat=lines mo
d
e, doing dirstat analys
i
s
based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
llow specifying --dirs
t
at c
u
t-off percentage
as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add c
o
nfig variable f
o
r spe
c
ifyin
g
de
f
a
u
lt --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Refactor
-
-dir
s
tat parsi
n
g; dep
r
ec
a
te --cumu
l
ati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Make
--dirstat
=
0 output directories
t
hat contribut
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Add several testca
s
es for --di
r
s
tat a
n
d friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
land
--di
r
stat:
In case of ren
a
mes
,
use ta
r
get filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
h
an Herland
Teach
-
-
dirstat not to completely ignore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
--
d
ir
s
tat-by
-
file: Make it faster and more corre
c
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
e
rland
-
-
dir
s
tat: Describe non-obvious di
f
ference
s
relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Her
l
and
Make "gi
t
notes add" m
o
re
u
s
e
r-friendly when
t
here
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Her
l
a
nd
lo
g
/pretty-options: Document --
[
no-]notes and de
p
r
e
cate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
ohan Herla
n
d
b
r
anch
/
checkout --tra
c
k: Ensure that upst
r
eam branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
p
u
s
h
.
default
:
Rena
m
e 'trac
k
in
g
' to 'upstre
a
m'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
Provi
d
e
'
git merge
-
-
a
b
ort' as a synony
m
t
o
'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
cm
d
_merge(): Parse options before chec
k
ing MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
r
ovide
'git notes get-ref' t
o
easily
re
t
rieve curren
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
g
i
t notes merge: Add testc
a
ses for me
r
ging notes t
r
ees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git
note
s
merge: Add another auto-resolving
s
trategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merge: --c
o
mmi
t
sho
u
l
d
fail if u
n
d
erlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git not
e
s merge: List con
f
licting no
t
e
s in notes
m
erge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
g
i
t note
s
m
e
rge: Manual c
o
nflict resolution, par
t
2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
g
i
t notes merg
e
:
Manual conflict reso
l
ution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
D
o
cum
e
ntat
i
on: Preliminar
y
docs on 'git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
g
i
t
n
o
tes mer
g
e: Add automat
i
c conflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes m
e
rge: Handl
e
r
eal, non-conflic
t
ing
n
ote
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
buil
t
i
n
/
notes
.
c
: Refac
t
or
creation of
n
o
t
es commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
gi
t
note
s
merge: I
n
itial imp
l
ementation
h
andling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
built
i
n/notes
.
c: Split notes ref DWIMme
r
y
i
nto a
separ
a
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
n
o
t
es
.
c: Us
e
two newl
i
nes (instead of one) when c
o
ncatenat
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herl
a
nd
(trivi
a
l) t3303
:
Indent with tabs inst
e
ad of s
p
aces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
notes
.
h/c: Propagate comb
i
ne_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
n
d
not
e
s
.
h/c
:
A
l
l
ow combine_notes functions
to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
H
e
rl
a
nd
n
otes
.
c:
Reorder functions in prep
a
ratio
n
f
or
n
e
xt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
e
r
land
n
o
tes
.
h: Ma
k
e default_notes_ref(
)
a
v
ailabl
e
in
notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n H
e
r
l
a
n
d
(trivial) notes
.
h
:
Mino
r
documentation fixes to copy_n
o
tes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hexify SHA1 in die() me
s
sa
g
e from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herl
a
nd
n
o
tes: Don't create (
e
m
pty) commit when removing
n
on
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
E
nab
l
e custom sche
m
es
for c
o
lumn colors
i
n the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
l
a
nd
M
a
ke
graph_
n
ext_line() available in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
revision: Turn
o
f
f histo
r
y simplification
i
n -
-
ance
s
try
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
revi
s
ion: Fi
x
ty
p
o in --ancestry-path
err
o
r
m
e
s
sage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
ha
n
Herland
Documentation/re
v
-
l
ist-opti
o
ns
.
txt: E
x
pl
a
in
--ancestr
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
Documentation/rev-list-options
.
txt: Fix
m
issing
l
i
n
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herla
n
d
diff
.
c: Ensure "index
$
from
.
.
$to" line co
n
tains unambig
u
ou
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-notes: Minor (mostly parse_options-rel
a
ted
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
ohan Herla
n
d
s
ubmodule su
m
mary:
D
on't ba
r
f when inv
o
ked in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
bu
i
l
tin-notes: Add "copy" subco
m
mand for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-no
t
es: Misc
.
refa
c
tori
n
g of
a
rgc
a
nd exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
built
i
n-n
o
te
s
: Add -c/-C options for reus
i
ng notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
no
t
es:
R
efacto
r
h
a
ndli
n
g of -F option
t
o
allo
w
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builti
n
-not
e
s
:
D
e
pre
c
ate the
-m/-F o
p
ti
o
ns for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
buil
t
in-note
s
: Add "a
p
pend"
s
ubcommand for appendi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
builtin-n
o
te
s
: Add
"add" subcommand
f
or adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Add -
-
messag
e
/--file alias
e
s for
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add "li
s
t
" subcomm
a
nd for l
i
sting note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
Documenta
t
i
on:
G
eneralize g
i
t
-notes docs
t
o 'o
b
jects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n
H
erland
builtin-notes: Add "prun
e
" subcommand for remo
v
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
N
ot
e
s
API: prune_
n
otes(
)
: P
r
une notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3305: Ver
i
fy that removing no
t
es trigger
s
automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
buil
t
in-no
t
e
s
: Add "remove" subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
Teach
b
uiltin-notes to re
m
ove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Teach notes code to prope
r
ly p
r
eserve non-note
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t3305
:
Ve
r
i
f
y that adding
m
any notes with git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
t3301: Verify s
u
ccessful annotati
o
n
o
f
n
on-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Her
l
and
Bui
l
tin-ify
g
it-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor note
s
c
o
ncat
e
n
a
t
ion into
a flexibl
e
interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API:
A
l
l
ow multiple concurr
e
nt notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
Not
e
s API: w
r
ite_notes_tr
e
e(): Store
the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n
H
erl
a
nd
Notes
API: for_
e
ach
_
not
e
(): Trave
r
s
e the entire not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
Notes API: g
e
t_note(
)
: Re
t
urn t
h
e n
o
te annotating t
h
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
Not
e
s
API: re
m
ove_note():
Remove no
t
e obje
c
ts
f
rom
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Notes API: add_note()
:
Add note objects to the internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
N
o
te
s
A
P
I: init_notes(): I
n
i
t
i
a
l
ize the
n
otes t
r
ee
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Add tests for checking cor
r
ect handlin
g
of $GIT_NOT
E
S
_R
E
F
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
Note
s
A
PI: get_co
m
mit
_
n
o
t
e
s()
-> forma
t
_n
o
te() + r
e
move
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosm
e
tic
f
ixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an Herl
a
nd
builtin-co
n
f
ig: Fix crash when usi
n
g "-f <relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Her
l
and
Add more testcases
t
o
t
e
s
t fast-im
p
ort of
n
otes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next