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
J
o
han Herl
a
nd
sample pre-commit hook: use --bool
w
hen r
e
trieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Herl
a
n
d
t3
2
00: Add test demonstratin
g
mino
r
regression in 41c
2
1
f
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
Herland
Refer to branch
.
<nam
e
>
.
rem
o
t
e/merge when documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Herland
t
3
20
0
: Mino
r
f
i
x when preparing for tracking failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t2024
:
Fix &&-
c
haining an
d
a couple
of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an He
r
lan
d
Move create_
n
ot
e
s_c
o
mmit() from notes-me
r
ge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move copy_note_for_
r
ewrite +
f
rien
d
s from builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
han Herla
n
d
fi
n
ish_copy_notes_for_rewr
i
te(): L
e
t
c
a
ller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herla
n
d
glossa
r
y:
U
pd
a
te a
n
d rephrase
t
he defi
n
ition of a remot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Validate trac
k
ing
b
ranches
with refspec
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2: Don't
use --tra
c
k option against "
s
vn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
H
erland
t7
2
01
.
24: Add
r
efspec t
o
keep
-
-track wor
k
ing
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han
Her
l
a
n
d
t3
2
00
.
3
9: tracking setup
s
houl
d
fail if there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
c
h
eckout: U
s
e remote refspecs
w
hen D
W
IMming tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
t20
2
4
: Show failure to
u
se ref
s
pe
c
when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han
Herland
t202
4
:
Add tes
t
s verifying c
u
rr
e
nt DWIM
behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
Herland
git symboli
c
-ref --delet
e
$symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rland
F
ix
f
ailure to del
e
te a packed re
f
t
h
rough a sym
r
ef
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-upda
t
e-ref: Add t
e
st ve
r
i
f
ying b
u
g wi
t
h symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
no
t
es-m
e
rge:
D
o
n't r
e
move
.
git/NOT
E
S_ME
R
G
E_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herland
note
s
-merg
e
:
u
s
e
ope
n
dir/re
a
ddir instead of using read
_
direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
t3310: illust
r
ate
f
a
i
lure to
"
n
o
t
e
s merge -
-
c
o
mm
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast-imp
o
r
t
: Fix incorrect fanout
l
e
vel when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
t9301: Add 2nd t
e
stcas
e
exp
o
sing bugs i
n
fas
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9
301: F
i
x tes
t
case
c
o
v
ering up a bu
g
in fast
-
im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t
5400: Fix
a couple of t
y
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han
H
e
r
l
a
nd
Mark
d
irstat error messag
e
s for trans
l
ati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
H
erl
a
nd
Improve e
r
ror handl
i
n
g when
p
ars
i
ng dirstat par
a
m
eters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
N
ew
-
-
dirs
t
at=lines mode, doing dirstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herla
n
d
All
o
w specifying --di
r
stat c
u
t
-
off perce
n
t
a
ge
a
s
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herla
n
d
Add c
o
nfig variable for s
p
ec
i
fying de
f
ault --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Refa
c
tor --dirsta
t
p
arsing; deprecat
e
-
-
cu
m
ulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
M
ake --dirstat=0 o
u
tput direct
o
ries that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
He
r
lan
d
A
d
d
several testca
s
es for --dirst
a
t
and
f
r
ien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Herland
-
-dirstat:
I
n case of renam
e
s, use target
f
i
l
ename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an He
r
land
Teach -
-
dirstat not to completely ignore
re
a
rranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Her
l
and
--di
r
stat-
b
y
-
f
ile: Make i
t
fa
s
ter a
n
d more
co
r
rect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rla
n
d
-
-dirstat: Describe
n
on-obvious differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an Herland
Make "g
i
t notes
add" more use
r
-frie
n
dly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herlan
d
log/pretty-o
p
tions: Docum
e
nt --[no-]notes a
n
d d
e
precate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joh
a
n H
e
rland
br
a
n
ch/
c
heckout --t
r
a
c
k: Ensure th
a
t
upstream bran
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
H
erland
p
ush
.
def
a
ult: Rename
'
tracking'
to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
Provide '
g
it me
r
ge --abort' as a sy
n
on
y
m
to
'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rland
cmd_m
e
rge
(
): Parse o
p
tions before chec
k
ing ME
R
GE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
P
r
ovide 'git not
e
s ge
t
-ref' to e
a
sily re
t
ri
e
v
e curren
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
er
l
and
gi
t
notes merge: Ad
d
te
s
tcases
f
or merging notes
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes mer
g
e: Add a
n
other aut
o
-res
o
lving
s
tr
a
teg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
g
it notes mer
g
e:
-
-commi
t
should f
a
il if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an H
e
r
land
git n
o
tes
merge:
Lis
t
conflict
i
n
g
no
t
es
in
n
otes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
git
n
otes mer
g
e: Manual
c
onflict resolut
i
on, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t no
t
e
s
merge: M
a
n
u
al conf
l
ic
t
r
e
solution, pa
r
t 1/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Documen
t
atio
n
:
Prelimina
r
y docs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git not
e
s me
r
g
e: Add
a
utom
a
tic c
o
nflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
g
i
t
n
otes merge: Ha
n
dle
real, no
n
-c
o
nflict
i
ng
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/
n
otes
.
c: Ref
a
c
t
or creation of notes
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes
m
erge: In
i
tial imp
l
em
e
ntation handling trivia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin/
n
otes
.
c: Split notes ref DWIMmery into
a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
l
a
nd
not
e
s
.
c
:
U
s
e two newlines
(instead of one) when conc
a
tenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial)
t3303: Ind
e
n
t with tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
notes
.
h/c: Pr
o
pa
g
ate combine
_
notes_fn retu
r
n val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
H
erland
notes
.
h/c: A
l
lo
w
combi
n
e_notes functions to remov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
c
: Reorder functions in prepara
t
ion for
n
ext
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herlan
d
notes
.
h
:
Make de
f
a
ult_notes_ref(
)
available in not
e
s API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herlan
d
(trivia
l
)
notes
.
h
:
M
i
no
r
doc
u
mentat
i
o
n fixes to cop
y
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
c:
Hexify SHA
1
in die() message fro
m
init_
n
otes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herl
a
nd
notes: Don't create (e
m
p
t
y) com
m
it
when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
h
an H
e
rland
Enable cu
s
t
om sche
m
es for column color
s
in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
r
land
Make graph_next_line(
)
avai
l
able in the grap
h
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
revi
s
i
o
n: Turn off history simplification i
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n Herland
rev
i
sion: Fix typo in --ancestry-path error m
e
ssage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
Documen
t
ation/rev-l
i
s
t-options
.
txt: Explain --a
n
cestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/
r
ev-list-options
.
t
x
t
:
Fix m
i
ssing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c:
E
nsure "index $from
.
.
$
t
o" line contains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Joha
n
H
erland
b
u
i
ltin-notes: Min
o
r (
m
o
s
t
l
y parse
_
options-r
e
lated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
oh
a
n
H
erland
sub
m
o
d
u
le summa
r
y: Don't
b
a
r
f
w
hen i
n
voked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
la
n
d
b
uiltin-notes: Add "cop
y
"
sub
c
o
mma
n
d for co
p
ying no
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
an
d
builtin-no
t
es: Misc
.
r
efactoring of argc and ex
i
t value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
l
a
nd
builtin-n
o
tes: Add
-
c
/-C o
p
tions for reusing
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
b
uil
t
in-notes: Refactor
handling of -F opt
i
on
to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes: Deprecate the -m/-F options
for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-no
t
es: Add "append
"
su
b
com
m
an
d
for
appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
b
u
iltin-notes: Add "add" subcommand for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes:
Add --mess
a
ge/--file
aliase
s
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
n
otes: Add "list
"
sub
c
ommand f
o
r list
i
ng
n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Documentation
:
Generali
z
e
g
i
t-n
o
tes doc
s
to 'obje
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: Ad
d
"prun
e
" subcomma
n
d for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rland
Notes API
:
prune_
n
o
t
es(): Prun
e
notes tha
t
belong
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t33
0
5: V
e
rify that
r
emo
v
ing
notes triggers
automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add "remove
"
subc
o
mma
n
d for
removi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
e
ach
b
uiltin-notes to remov
e
empty n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes code to
p
r
o
perly p
r
eserve
n
on-notes i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
t330
5
:
Ver
i
fy that adding many notes with git-n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
301:
Ve
r
ify successfu
l
anno
t
a
t
ion o
f
non-com
m
its
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
B
uiltin-i
f
y git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Refactor n
o
tes con
c
atenation into a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Not
e
s API: Allow mult
i
p
l
e
concurrent
note
s
trees
w
i
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
N
ot
e
s API
:
wr
i
te_note
s
_tree(): Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
for_each_note(): Traverse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
Note
s
API:
g
et_
n
o
t
e(): Return the
note annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: r
e
move_note(): Remov
e
note
objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next