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
Fix failure to delete a packed ref through a symref
2012-10-21
Johan Herland
Fix failu
r
e to d
e
lete
a packed re
f
through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
Herland
t1400-upd
a
t
e-ref: A
d
d
t
e
st
verifying b
u
g
with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
l
a
nd
n
ot
e
s-merge: Don't remove
.
g
it/NOTES_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herland
notes-merge: use o
p
endir/readdir
i
nstead
of u
s
ing
r
ead_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herlan
d
t
3
310: illu
s
trate fa
i
lur
e
to "notes merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
oha
n
Herland
fast-import
:
Fix incorr
e
ct fan
o
ut
level whe
n
m
o
d
ifyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
t9301:
Add 2
n
d test
c
ase exposing bugs in fa
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix test
c
ase c
o
ver
i
n
g up a b
u
g in
f
ast-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t
5
400: F
i
x a couple of t
y
pos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
M
a
r
k dirstat er
r
o
r
m
e
ss
a
ges for tr
a
ns
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Improve e
r
r
o
r
h
a
ndling when parsi
n
g dirstat
p
a
r
a
met
e
rs
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Ne
w
--d
i
rstat=lines mode, d
o
ing dir
s
tat analy
s
is
ba
s
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herl
a
nd
Allow specifying
--dirstat cut
-
o
f
f
percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Add
c
onfig
v
ariable for
s
p
ecif
y
ing d
e
fau
l
t --dirst
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Ref
a
ctor
--dirstat parsing; d
e
precate --cu
m
ul
a
t
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
H
e
r
land
Make --di
r
stat
=
0 output directories tha
t
contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
A
d
d s
e
veral testcases
fo
r
--di
r
stat
an
d
frie
n
ds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n He
r
la
n
d
--dirs
t
a
t
: In ca
s
e of
ren
a
mes, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Tea
c
h -
-
dirstat
n
ot to com
p
l
et
e
ly ign
o
re rear
r
ange
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
--
d
irstat
-
b
y
-file: Make it faster
an
d
more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--dirsta
t
: De
s
cribe non-obvious
d
iffe
r
ences rela
t
i
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
h
an H
e
rland
Mak
e
"gi
t
n
ote
s
ad
d
" m
o
re user-fri
e
ndly
w
hen th
e
re
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
l
o
g/pretty-options: Do
c
ument --[
n
o-]notes and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/chec
k
out --track: Ens
u
re
t
hat up
s
tream
bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Her
l
and
push
.
default: Rename 'tracki
n
g' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
Provide 'git merge --abort' as a synonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
cmd_merge(): Pa
r
s
e
opt
i
o
n
s
b
efore checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erla
n
d
Provide 'git
notes get
-
ref' to
easily r
e
t
r
ieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge:
Add
testcas
e
s f
o
r merging
n
o
t
e
s trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Her
l
and
git
notes mer
g
e: Add another auto-resolving strate
g
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
e
r
l
and
git notes merge: --commit should
f
a
i
l if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herla
n
d
git notes merge: L
i
s
t
con
f
lic
t
ing not
e
s in notes me
r
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git n
o
t
es merge: Manu
a
l
co
n
flict
r
e
s
olution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
M
anual conflict reso
l
utio
n
, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documen
t
atio
n
:
Preli
m
i
nary docs on '
g
it
n
otes m
e
rge
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes
m
e
r
ge: Add auto
m
at
i
c conflict res
o
lvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git
n
ote
s
merge: H
a
ndle real,
non-conflicting n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/n
o
tes
.
c: Refactor creati
o
n of notes c
o
mmits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git note
s
m
erge:
Initial imple
m
e
n
ta
t
ion handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
built
i
n/n
o
tes
.
c:
Split
n
o
tes ref DWIMmery into a separat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
notes
.
c: Use two newlines (inste
a
d of on
e
)
w
h
en con
c
atenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3303:
Indent
w
ith
t
abs
i
n
stead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
notes
.
h/c: Pr
o
pa
g
a
t
e
combine_
n
o
tes_
f
n return val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herl
a
nd
notes
.
h
/
c:
Allow comb
i
ne_notes
functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
no
t
es
.
c:
Reo
r
der function
s
in prepara
t
i
o
n
fo
r
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
h: Mak
e
default_notes_ref() avail
a
b
l
e
in not
e
s
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
(tr
i
vial) not
e
s
.
h
:
M
inor d
o
cu
m
entation fixes to cop
y
_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
no
t
es
.
c: Hexi
f
y SHA1 in die(
)
mes
s
ag
e
from i
n
it
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herla
n
d
notes: Don't
cre
a
te (empt
y
)
commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rl
a
nd
Enable cus
t
om sch
e
mes for co
l
umn colors in
the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make gr
a
ph
_
next_line(
)
a
vailable in t
h
e g
r
aph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
revision:
T
urn off hi
s
tory simplification i
n
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erla
n
d
revision: F
i
x
t
ypo in
--ances
t
r
y
-path
e
rror message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
r
land
Documentation/rev-list-
o
pti
o
ns
.
txt: Explain
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
Documentatio
n
/re
v
-list-opt
i
ons
.
txt
:
Fi
x
m
issing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
di
f
f
.
c: Ensure "index $from
.
.
$to" line co
n
tains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
h
a
n
Her
l
a
nd
builtin
-
no
t
es: Minor (mostly
p
ar
s
e_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herl
a
nd
s
ubmodule summary: Don't barf wh
e
n invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Add "c
o
py" su
b
command
f
o
r
c
opying not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin
-
notes:
M
i
s
c
.
refactoring of argc and exi
t
va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
Herland
b
uiltin-notes:
A
dd -c/-C optio
n
s fo
r
r
e
us
i
n
g
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
buil
t
in
-
notes
:
Refactor handling
o
f -F option
t
o allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes: De
p
recate t
h
e -m/-F options
f
or "g
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bui
l
tin-notes: Add "app
e
nd
"
su
b
c
ommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes: Ad
d
"ad
d
" subcomman
d
for adding n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
bui
l
ti
n
-notes: Add --message/--fil
e
alias
e
s for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
builtin-no
t
es: Add "
l
ist" subcommand for listing
not
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
He
r
land
Documentat
i
on: General
i
ze g
i
t-
n
otes docs to 'objec
t
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-
n
otes: Add "prune" sub
c
omma
n
d for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herl
a
nd
Notes API
:
p
r
u
ne_notes(): Prune notes tha
t
bel
o
ng to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305
:
V
erify tha
t
removing
n
o
te
s
tr
i
gg
e
rs
a
utomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
builtin-notes: Add "remove" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
Teach builtin-notes
t
o
r
emove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
e
ach notes code to
prop
e
rly preserve n
o
n-not
e
s in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3305: Ve
r
ify that adding ma
n
y no
t
es
w
i
th git-
n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t
3301: Ver
i
f
y
succe
s
sful
a
n
not
a
t
ion of non-commit
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Bui
l
tin-ify gi
t
-
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
R
e
factor notes co
n
caten
a
tion
i
nto a
flex
i
ble in
t
erface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API:
All
o
w
m
u
lti
p
le concur
r
ent note
s
trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Notes API:
w
rite_notes_tree(): Store the notes
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes
A
P
I: for_each
_
note():
T
r
a
verse
the
e
ntire note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_note(): Return the not
e
annotating th
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
la
n
d
N
otes API: remove_note(): Remove note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API: add_n
o
te(): Add note objects to the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: init_notes():
Initialize the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
Add tes
t
s
f
or
c
hecking cor
r
ec
t
hand
l
ing of
$GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
He
r
land
Note
s
API: get_
c
ommit
_
notes() -> f
o
rmat_note()
+ remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Minor cosme
t
ic fixes to n
o
tes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an Herland
bui
l
tin-config:
F
ix crash when using "-f <
r
elati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
A
dd more test
c
ases t
o
t
e
st fast-import of
n
ote
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to t
9
350, to
make ro
o
m for more fast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herl
a
n
d
fast-import:
P
rop
e
r
notes
tree man
i
p
u
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n Herland
Fix
c
rasher on
e
ncount
e
ring SHA1-l
i
ke non-
n
o
t
e in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
J
ohan Herland
Ba
s
ic build infr
a
s
tructur
e
f
o
r
P
ytho
n
scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Add selft
e
sts verif
y
in
g
concate
n
ation of multi
p
le notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refactor n
o
tes
code to conca
t
ena
t
e multi
p
le no
t
es
a
nnotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
Add selft
e
s
t
s verifying that we can parse notes tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Teach th
e
notes look
u
p cod
e
to par
s
e notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Her
l
and
Teac
h
n
o
tes code to
f
ree its internal data st
r
uctures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
r
l
and
Add flags to get_commit_not
e
s() t
o
c
ontr
o
l the
f
o
rmat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next