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
Merge branch 'jc/advise-i18n' into maint-1.7.8
2011-11-29
Joha
n
He
r
land
fast-i
m
port
:
Fix
i
ncorrec
t
f
a
nout le
v
el when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
t
930
1
: Add 2nd
testcase
expo
s
ing
b
ugs in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix testcas
e
c
overing
u
p
a
bug
in
fa
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
erland
t5400: Fi
x
a couple of
typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
nd
Mark dirstat error me
s
sag
e
s for tran
s
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Improve er
r
or handling whe
n
parsin
g
dirstat
p
aramete
r
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herlan
d
Ne
w
--dirstat=lines mode, doing di
r
st
a
t analys
i
s base
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Allow s
p
e
c
ifying
-
-dirstat cut-off
p
ercent
a
ge as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Add co
n
fi
g
variabl
e
fo
r
spec
i
fy
i
ng
defaul
t
--di
r
stat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Ref
a
ctor --dirstat par
s
ing; depreca
t
e -
-
cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rla
n
d
Make --dirstat=
0
ou
t
pu
t
dir
e
ctories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Her
l
and
Add several testcases fo
r
--dirsta
t
and frien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan
Herland
--dirstat: I
n
case of ren
a
mes, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rl
a
nd
T
e
ach --dirsta
t
not
to complete
l
y
i
gnore rearra
n
ged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
--dirstat-
b
y-file: M
a
ke it faster and m
o
re correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
Herl
a
n
d
--dirstat: Desc
r
ib
e
non-obvious
diff
e
rences rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
Mak
e
"git n
o
t
es add" more us
e
r-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
ha
n
H
erla
n
d
l
o
g/
p
ret
t
y-op
t
i
o
ns: Document -
-
[no-]no
t
es and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
He
r
land
b
ranch/che
c
k
out --t
r
ack: En
s
ure
t
h
a
t upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
ohan Herland
pu
s
h
.
d
e
f
ault: Rename 'tracking
'
to 'upstrea
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
rovide 'git
me
r
ge --
a
bort' as a synonym
t
o 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
c
md_merge
(
): Pars
e
options bef
o
re c
h
e
c
k
ing MER
G
E
_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
Provide 'gi
t
notes get-ref' to
easily retrieve cu
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merge: A
d
d tes
t
cases for merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herl
a
nd
gi
t
notes mer
g
e
: Ad
d
another auto-resolving strate
g
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
g
it
notes mer
g
e: -
-
com
m
it
shou
l
d fail
if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merg
e
: Li
s
t
c
onflicting not
e
s in notes me
r
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
Manual conf
l
ic
t
resolu
t
ion, part
2
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git
n
otes merge: Manua
l
c
o
n
fl
i
ct resol
u
tion, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n He
r
land
Documentatio
n
:
P
reli
m
inary docs on 'git
notes
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
gi
t
not
e
s m
e
rge:
A
dd autom
a
tic
conflict reso
l
v
e
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herland
git notes me
r
ge
:
Handle real, non-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
buil
t
in/notes
.
c:
Refacto
r
creati
o
n of n
o
tes c
o
mmits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
lan
d
g
i
t n
o
t
es merge: Initial implementation handling
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
n
d
builtin/note
s
.
c: Split notes ref DWIMm
e
ry into a s
e
parate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
note
s
.
c: Use t
w
o n
e
wlines
(
i
nstead of one) when
c
o
n
catenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
Herland
(trivia
l
) t3303:
I
ndent with tabs i
n
stead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
notes
.
h/c: Pro
p
agate
c
ombine_notes_fn
retur
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
h
/c: Allow combin
e
_
not
e
s funct
i
o
n
s
to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
a
n
d
no
t
es
.
c
: Reorder fun
c
tions in preparation for
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
n
d
not
e
s
.
h: Make default_n
o
tes_ref() availabl
e
i
n notes AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
(
trivial
)
notes
.
h
:
M
inor docum
e
ntati
o
n fix
e
s
t
o copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
H
erland
notes
.
c:
H
exify SHA1 in d
i
e()
messag
e
from init_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't create (empty) co
m
mit when remo
v
ing n
o
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herland
Enable cu
s
t
om s
c
hemes
f
or colum
n
c
o
lors in the gr
a
p
h A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n He
r
land
Make graph_next_line
(
) av
a
ila
b
le in
the
g
raph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
r
evision: Turn off his
t
ory s
i
mplification in --
a
ncestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han
H
erl
a
nd
rev
i
sion: Fix ty
p
o in --an
c
est
r
y-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n Herland
Docum
e
ntation
/
r
e
v-lis
t
-
o
p
tions
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han
Herland
Docum
e
n
t
a
ti
o
n/re
v
-
list-options
.
txt
:
F
i
x
m
i
s
sing l
i
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herland
dif
f
.
c: Ensure "index $
f
r
o
m
.
.
$to" line contains unamb
i
guou
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
buil
t
i
n-notes: M
i
nor (mostly parse_options-rel
a
t
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
a
n He
r
l
an
d
submodule summary: Don't barf when invoke
d
in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
builtin-no
t
e
s: Add
"cop
y
" subcomma
n
d for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes:
Misc
.
re
f
acto
r
ing
o
f arg
c
and
e
x
i
t
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
builtin-notes
:
Add -
c
/-C optio
n
s
f
o
r reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
built
i
n-notes: Re
f
actor h
a
ndling of
-
F o
p
tion
t
o
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
built
i
n-notes: Deprecat
e
the -m/-F options f
o
r "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
b
u
ilti
n
-notes: Add "append" subcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
n
d
b
u
i
l
tin
-
notes: Add "
a
dd"
subcommand f
o
r
addin
g
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
builtin-notes: Add --messag
e
/-
-
file
a
l
iases for -
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
buil
t
in-no
t
es: Add
"
l
i
st"
s
ub
c
ommand f
o
r listing
note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
Documentation: Gen
e
ralize git-notes docs
t
o 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-note
s
: Add "prune" subcom
m
a
nd for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
t
es A
P
I: prune_notes()
:
Prune notes
t
h
at belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Her
l
and
t3305: Ve
r
ify that re
m
oving note
s
tr
i
ggers automat
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Add "rem
o
ve" sub
c
ommand for r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Teach builtin-not
e
s to
remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
la
n
d
Teach
n
otes code to
p
roperly preserve
non-not
e
s in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herla
n
d
t330
5
:
V
erify
that adding many note
s
with
g
it-note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3301: Verify successful annotat
i
o
n
of non-co
m
mits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin
-
ify
git-no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Ref
a
c
t
or notes concat
e
nation into a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: Allo
w
multiple concurrent notes
t
r
e
e
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Note
s
API: wri
t
e_notes_tree(): Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes AP
I
: for_
e
ach_note(): Travers
e
the entire no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Note
s
A
PI:
g
et_
n
ote(): Re
t
urn the note annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rlan
d
Notes
A
PI: rem
o
ve_no
t
e():
Remove note
o
bj
e
cts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
te
s
API
:
add_n
o
te()
:
Add
n
ote ob
j
e
c
ts to the in
t
erna
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
ote
s
API
:
init_no
t
es(): Init
i
aliz
e
the no
t
es tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Add tests
f
or chec
k
i
n
g correct
h
andling o
f
$GI
T
_NOT
E
S_R
E
F
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
nd
N
o
tes
A
P
I: get
_
commit_notes() -> format_note(
)
+ remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Her
l
a
n
d
Minor cosmet
i
c
fixes to n
o
tes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
o
h
an Herlan
d
builtin-config: Fix crash wh
e
n using "
-
f <rel
a
ti
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
Ad
d
more testcases to test
f
ast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Re
n
a
m
e
t
9301 to
t
9350, to m
a
ke room f
o
r more fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Her
l
and
f
a
st-impor
t
: Proper notes tree manipula
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herl
a
nd
F
i
x crasher on e
n
co
u
ntering SH
A
1-like n
o
n-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joha
n
He
r
land
Ba
s
ic buil
d
infra
s
tructure for Python scrip
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Add selftests verifyin
g
concatenation of m
u
l
t
i
ple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Refactor notes code to co
n
cate
n
at
e
mult
i
ple notes annot
a
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
Add s
e
lftests
v
erifyi
n
g that we can pars
e
note
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
T
e
ach the notes looku
p
code to
parse not
e
s trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
n
d
T
e
ac
h
notes c
o
de to
f
ree its i
n
t
e
rnal data str
u
ctures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Add flags to g
e
t_c
o
m
mit_notes() to control t
h
e fo
r
mat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t
3
30
2
-
notes-i
n
dex-expensive: Speed up create
_
repo
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Her
l
and
fast
-
imp
o
r
t: Add s
u
pp
o
rt
f
or i
m
port
i
ng co
m
mit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
Teach
"-m <msg>
"
and "-F <
f
ile>" to "git not
e
s edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan
Herland
git c
l
o
n
e: Add --re
c
u
rsiv
e
t
o aut
o
matically
che
c
kout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t7407:
U
se
'
r
e
v
-parse --short' r
a
ther than bash's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next