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
t2024: Fix &&-chaining and a couple of typos
2013-09-09
Jo
h
an Her
l
and
t
2024:
Fix &&-chaining
a
n
d a
couple of typo
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
H
e
rland
glossary: Updat
e
and rephrase the definition of a
r
em
o
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
He
r
l
a
n
d
bra
n
c
h
.
c: Validate tracking bran
c
hes with
r
efspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t9114
.
2: Don't use
-
-trac
k
option
a
gainst "svn-
r
em
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t
7
2
01
.
24: Ad
d
refspec to kee
p
-
-
t
r
ack working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3200
.
39:
tracking setup
s
h
oul
d
f
ail if there is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
ch
e
ckou
t
: Use re
m
ote
ref
s
pecs
w
hen DWIMming track
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024:
S
how fa
i
lur
e
to use
re
f
spec when DW
I
Mming
rem
o
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
Herland
t2024: Add
tests verifying current DWIM behavio
r
of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
git
symbolic-re
f
--d
e
lete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
Fix failu
r
e to delete a pac
k
e
d
ref
thr
o
ugh a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
nd
t
1
400-upd
a
te-
r
ef: Add
t
es
t
verifyin
g
bug with s
y
m
r
e
f
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herla
n
d
n
otes-mer
g
e: Don
'
t remov
e
.
g
i
t/NOTES_MERGE_WO
R
KTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-
m
erge:
u
se
o
p
endir/readdir instead of us
i
ng read_
d
irec
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n
H
erland
t33
1
0
:
illu
s
t
rate failure to "notes merge -
-
commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an
H
e
rland
fast-i
m
por
t
:
Fix
incor
r
ect
fanou
t
level when mo
d
i
fying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
lan
d
t93
0
1
: Ad
d
2nd testca
s
e exposing bugs
i
n fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herland
t9301: Fix
t
estcas
e
covering up a bug in fast-im
p
ort
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Her
l
and
t5400
:
Fix
a
couple
of
t
ypos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Mark di
r
st
a
t
e
rror messages f
o
r translatio
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han
H
erland
Improve error handling
when parsi
n
g dirstat parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
New --dirstat=lines mode
,
d
oing dir
s
tat analysi
s
based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an Herla
n
d
Allow specif
y
ing --dir
s
tat
c
u
t-off percentage as
a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n He
r
land
Add config variable for specifying default --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Re
f
act
o
r --dirstat p
a
rsing
;
d
eprecate -
-
cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Make
--dirstat=0
o
utput directorie
s
t
h
at contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Add several
t
estcases
for
--dirstat a
n
d fri
e
nds
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--d
i
rstat: In case
o
f renam
e
s, use target f
i
l
e
nam
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Her
l
a
nd
Teach --dirs
t
a
t
not to complete
l
y ignore
r
ear
r
ang
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--dirs
t
at
-
by-file: M
a
ke it
f
aster and
m
ore corr
e
ct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
-
-dirst
a
t
:
De
s
cribe no
n
-obvious differences
relativ
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Mak
e
"
g
it note
s
add" mor
e
u
s
e
r-friendly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
log
/
pret
t
y-opt
i
ons:
D
ocument --[
n
o-]notes
a
nd de
p
recate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checko
u
t
--track: Ensure th
a
t
upstream bran
c
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herla
n
d
push
.
default: Rename
'tracking' to
'up
s
t
r
e
am'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
Provide 'git merge
-
-abort' a
s
a
synonym
to
'git re
s
et
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
cmd
_
merg
e
(): Par
s
e options
before
c
he
c
king
MERGE_HE
A
D
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
Provide 'g
i
t
notes
get-ref'
t
o easily retri
e
ve curr
e
n
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
gi
t
notes
m
erge:
Add testcases for merging notes tr
e
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erland
git notes merge: Add
ano
t
her au
t
o-resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge: --commit should fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge
:
L
i
st confli
c
ti
n
g notes in notes m
e
rge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git
notes merge:
Manual conflict resolution,
part 2
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merg
e
: Manual conflict r
e
solution, part 1
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
Document
a
tio
n
: Prelimina
r
y docs
on 'git note
s
mer
g
e'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes merge:
A
dd automatic c
o
nflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
gi
t
not
e
s merge: Handle real
,
non-conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
builtin/notes
.
c: Refactor creation of notes
c
omm
i
t
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes mer
g
e:
I
nitial impleme
n
tation hand
l
ing
t
r
ivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
builtin/no
t
es
.
c:
Split note
s
ref
D
W
I
M
m
e
ry i
n
to a separat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
and
notes
.
c: Use
t
wo newlines (instead of
one
)
when co
n
ca
t
e
natin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
(trivi
a
l
)
t
3
3
03: In
d
ent
with
t
a
bs i
n
stead o
f
spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
note
s
.
h/c: Propagate co
m
b
i
ne_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c:
A
llow co
m
bine_not
e
s functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
c:
Reorder
f
u
nctions
i
n prepara
t
i
o
n
for n
e
xt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
oha
n
Herland
n
o
t
e
s
.
h:
Make default_notes_
r
ef() available in notes
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an
Herlan
d
(trivial
)
notes
.
h: M
i
n
o
r
d
o
c
umentat
i
o
n fixes
t
o
c
opy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c: H
e
xif
y
SHA
1
i
n
die(
)
message fr
o
m
i
nit_not
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herl
a
nd
notes: D
o
n't
c
re
a
te (e
m
p
ty) commit when
re
m
ov
i
ng
n
o
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herland
Enable custom sch
e
mes f
o
r c
o
lumn c
o
lors in the
g
raph AP
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Mak
e
graph
_
next_line() available in th
e
graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han H
e
rland
revision: Turn off history simplificatio
n
in --ancest
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
on: Fix ty
p
o in --anc
e
str
y
-p
a
th error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documen
t
ation/re
v
-list-opt
i
on
s
.
t
x
t
:
E
xpla
i
n
-
-ancestr
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation
/
rev-list-
o
ptions
.
txt: F
i
x
mi
s
sing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
r
l
and
diff
.
c
:
E
n
sure "i
n
dex
$from
.
.
$to" line c
o
ntains unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan
H
erland
builtin-note
s
:
Minor (most
l
y
p
arse
_
op
t
i
o
ns-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
sub
m
odul
e
s
umm
a
ry
:
Don't
barf
w
he
n
inv
o
ked in an emp
t
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
b
u
il
t
in-n
o
tes: Add "copy" su
b
command for copyi
n
g
note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
bu
i
lt
i
n-n
o
tes: Misc
.
refactoring of argc and exi
t
va
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Add -c/-C options
f
or
reusing
n
otes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Her
l
a
n
d
builtin-notes: Refactor h
a
n
d
ling of -F option to allo
w
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
n
d
b
u
iltin-no
t
e
s
: Deprecate the -m/-F options
f
or "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-note
s
:
A
dd
"
a
pp
e
nd
"
subco
m
mand for
a
p
pending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
l
ti
n
-notes: A
d
d "add"
subcommand for ad
d
ing notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
builtin-notes: Add --messag
e
/--file al
i
ases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
buil
t
i
n
-notes: Add "list" sub
c
om
m
and for li
s
ting not
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentation: Generalize git-n
o
tes docs
to 'obj
e
cts
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Add "prune" s
u
bcomm
a
nd for
r
em
o
v
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
No
t
es A
P
I:
p
r
u
ne_n
o
tes(): Prune notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t33
0
5:
V
e
r
ify tha
t
removing note
s
triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
ui
l
tin-n
o
tes: Add "rem
o
ve" su
b
command for
r
e
m
o
vi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Teach builtin-
n
otes to remov
e
empty n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
n
otes code to properly preserve non
-
note
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
t330
5
:
V
erif
y
that a
d
din
g
man
y
notes
w
it
h
git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t3301: Ve
r
ify successful annotatio
n
of non-co
m
m
its
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
Builtin-ify git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Re
f
actor not
e
s
c
o
ncatenat
i
o
n into a flexible in
t
erface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API:
Allow mu
l
tiple concurrent not
e
s trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
Notes API:
w
rite_notes_tree():
S
tore the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API:
for_each
_
n
o
te
(
):
Traverse
t
h
e
entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
:
g
et_note
(
): R
e
turn the note ann
o
tating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: remove_not
e
(): Remove note object
s
from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API:
add_n
o
te(): Add note objects
t
o th
e
interna
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
N
otes
A
P
I: init_note
s
(
):
I
nitia
l
ize the
n
ot
e
s tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Add tests for checking
correct handling of $G
I
T_NOTES_
R
EF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
Not
e
s API: get_co
m
mit_
n
otes() -> format_
n
o
te() + re
m
ove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Minor
cosmetic f
i
xes to not
e
s
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-config: Fix
c
rash when using "-
f
<re
l
ative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herland
A
d
d mo
r
e
t
estcases to test fast-i
m
po
r
t of not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next