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
Documentation/Makefile: make AsciiDoc dblatex dir configurable
2013-09-24
Johan Herland
sa
m
ple pre
-
c
o
m
mi
t
h
ook:
u
se --
b
o
ol
w
he
n
retrievi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herlan
d
t32
0
0: Add test demonstrating minor regression in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
ha
n
Herland
Refe
r
to branch
.
<n
a
me>
.
remote
/
m
e
r
ge when
d
ocum
e
nting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Herland
t3200
:
Minor
fix when pre
p
a
ring for tracking failur
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t
2024
:
Fix &&-chai
n
ing and
a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
n
d
Move create_notes_co
m
mit(
)
f
rom notes-m
e
rge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
han
Her
l
a
n
d
Mov
e
copy_note
_
for_rewrite
+ f
r
i
e
n
ds f
r
om builtin/no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_
c
o
p
y
_notes_for_rewrit
e
(
)
: Let cal
l
e
r
provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herl
a
nd
glossar
y
: Upda
t
e
and
r
e
p
hrase the definition of a r
e
mot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
l
a
nd
b
r
anch
.
c:
Validate tracki
n
g
b
ranches with
r
efspe
c
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t
9114
.
2: Don't use --track option
aga
i
nst "svn-
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t
7201
.
24: Add
refspec to keep -
-
t
r
ack worki
n
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t3200
.
39:
t
rackin
g
se
t
up sh
o
u
ld fail if th
e
r
e
is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Her
l
and
checkout: Use remot
e
ref
s
pecs when DWIMming
t
r
a
c
king
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
2
024: Show failu
r
e to use r
e
f
s
p
e
c whe
n
DWIMming re
m
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
e
rland
t2024:
A
dd tests verifying cur
r
ent DWIM be
h
av
i
or of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
ha
n
Herland
git sy
m
b
olic-ref --delete
$
symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
h
a
n
Herlan
d
Fix failure
t
o delete a packe
d
re
f
t
hroug
h
a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an Herland
t
1
4
00-update-ref: Add test
v
erifying
b
ug with symre
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
notes-me
r
ge: Don'
t
remov
e
.
git/NOTE
S
_M
E
RGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n
Herland
notes-merge: u
s
e
opendir/
r
e
a
ddir instead of using read_
d
irec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310:
i
ll
u
stra
t
e
f
ailure to "notes mer
g
e --com
m
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n He
r
l
a
nd
fast-import: Fi
x
i
ncorrect fanout lev
e
l
when
modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2nd testcas
e
exposing bugs in fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9
3
01: Fix tes
t
case covering up a b
u
g in fast-im
p
o
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5
4
0
0
:
F
ix a
c
oupl
e
o
f typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark di
r
stat
e
rror
mess
a
ges for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Improv
e
error handling
when parsin
g
dirstat p
a
rameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
New --di
r
stat=lines
m
o
d
e, doing dirs
t
a
t
analys
i
s based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow s
p
ecifying -
-
d
irstat
c
ut-
o
ff perc
e
ntage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
A
dd confi
g
variable for spec
i
f
y
ing defa
u
lt --dirst
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Refactor -
-
dirs
t
at parsi
n
g; d
e
prec
a
te --c
u
m
u
la
t
ive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han
Her
l
a
nd
M
ake
--dirstat=0 o
u
tput direc
t
ories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Ad
d
s
e
veral t
e
stcases for
--dirstat
a
nd friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han
Herland
--dirstat: In ca
s
e
o
f
rena
m
es, use t
a
rget
f
ilename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
He
r
land
Teach --d
i
r
s
tat n
o
t
t
o
completel
y
ignore rearran
g
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
oh
a
n
H
e
rl
a
n
d
-
-dirst
a
t-by-f
i
le: Make it faster and
more co
r
r
ect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--d
i
rstat: Desc
r
ibe non-
o
bvious differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
erla
n
d
Make
"g
i
t
notes add" more
user-fri
e
nd
l
y
when
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
l
o
g/pre
t
ty-options: Document --[no-]no
t
e
s and depreca
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joh
a
n Herland
branch/chec
k
out --
t
r
ack:
E
nsure that upstre
a
m
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
Herland
push
.
default: Rename 'tra
c
king' to
'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
P
rovide
'
git merge --abort' as a synonym
t
o '
g
it
r
eset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge(): Parse o
p
tions b
e
fore c
h
eckin
g
MERGE
_
HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'g
i
t notes get-ref' to eas
i
ly retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git
n
otes merge: Add testcases for merging n
o
tes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merge:
A
d
d
ano
t
her auto
-
resolving strateg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
l
and
git
notes
m
erge: --commit should f
a
il if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
gi
t
notes
m
e
rge: L
i
st confli
c
ting
notes in notes merg
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
git note
s
m
erge: Manual confli
c
t
resolution, par
t
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge: Manual conf
l
ict resolution,
p
art 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n H
e
rl
a
nd
Do
c
umen
t
at
i
on: Prelim
i
na
r
y
d
o
c
s
on 'g
i
t no
t
es merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
git notes merge: A
d
d a
u
tomatic conflict
r
esolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge
:
Handl
e
real, non-conflicting
n
ot
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
buil
t
in/notes
.
c: Refa
c
tor
creati
o
n of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merge: Initial implementation handling
t
r
ivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c:
S
plit notes ref DWIMmer
y
into
a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c:
U
se two
n
ewlines (
i
ns
t
ead
o
f
one) when conca
t
en
a
tin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
rland
(trivial
)
t33
0
3:
Indent with tabs
instead of
s
pac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
notes
.
h/c:
P
ro
p
agate combine_notes_fn return va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an He
r
land
notes
.
h/c
:
Allow combi
n
e_note
s
fun
c
tio
n
s to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
c: Reorder functions
i
n preparat
i
o
n for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make de
f
a
ult
_
notes
_
ref() avai
l
able in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
oh
a
n Her
l
a
n
d
(t
r
i
vi
a
l
)
notes
.
h
:
Mi
n
or documentation fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Her
l
and
notes
.
c: Hex
i
f
y SHA1 in die() m
e
ssage from
i
n
i
t
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
n
otes: Don't creat
e
(empty) commit when remo
v
ing no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custom schemes fo
r
column col
o
r
s in the
g
raph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
He
r
l
a
nd
Make graph_next_line() available in
the graph
.
h
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
revision:
T
urn of
f
h
istor
y
si
m
plification in -
-
a
nces
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
revision: Fix typo in --ancestry-pat
h
error
messa
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
e
rland
Document
a
tio
n
/
r
ev-li
s
t-opti
o
ns
.
txt
:
Explain --an
c
estr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han H
e
rland
Do
c
umentation/rev-list-options
.
txt: Fix missing
l
i
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: E
n
sur
e
"
index $from
.
.
$to"
l
ine
cont
a
i
n
s unambiguo
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herlan
d
builtin-note
s
: Minor (mo
s
t
l
y par
s
e_op
t
ions-rel
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n
H
e
r
land
su
b
m
odule
s
u
m
mary: Don't b
a
rf when invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Add
"
c
op
y
" subcomma
n
d f
o
r copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-
n
otes: Misc
.
refact
o
ri
n
g of
argc and exi
t
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
builtin-notes:
Add -c/-C op
t
ions fo
r
reu
s
in
g
n
ot
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin
-
notes: Refac
t
or handling of -F opt
i
on
to
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
bu
i
ltin-notes: Deprecate the -m/-F options
f
or "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes:
Add "append
"
s
u
b
command
f
or
appe
n
din
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
builtin-notes: Ad
d
"ad
d
" su
b
command
f
o
r
adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add --message
/
-
-
file aliases
f
or
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
bu
i
ltin-
n
o
tes:
Add "list" sub
c
ommand for
l
i
sting
note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Documentation:
General
i
ze git-no
t
es docs
t
o '
o
b
je
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d "pr
u
ne" subcommand
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
Note
s
API: prune_
n
otes():
Prune
notes
t
h
a
t belong
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
t3305
:
Ve
r
if
y
that removing notes t
r
ig
g
ers
a
utoma
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add "remove" subcomman
d
f
o
r remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach builtin
-
notes to re
m
ove emp
t
y notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Tea
c
h
n
otes code to pr
o
per
l
y
preserve non-not
e
s
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
0
5: Verify t
h
at
adding
many
notes
w
ith
git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
t3
3
0
1
: Verify successf
u
l ann
o
tation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Built
i
n-ify
g
i
t
-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
Refact
o
r notes con
c
a
t
e
n
a
tion into a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es API: Al
l
ow m
u
ltiple concurrent
n
otes
t
r
e
e
s
w
it
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I: write_notes_tree(): Store the note
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: for_each_note(
)
: Trav
e
rs
e
the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes API: g
e
t_note()
:
Retu
r
n the note annotating
t
he
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Not
e
s API: rem
o
ve_note():
R
emo
v
e note obje
c
ts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next