repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
New --dirstat=lines mode, doing dirstat analysis based on diffstat
2011-04-29
J
ohan Herlan
d
N
e
w
--dir
s
tat=lines
mode, d
o
ing
dirstat analysis base
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Al
l
ow specif
y
in
g
--dirstat cut-off p
e
rcentag
e
as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
H
erland
Ad
d
c
o
nfig var
i
able fo
r
specifying d
e
fault --dirs
t
at
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
er
l
and
Refact
o
r --d
i
rst
a
t
pars
i
ng; deprecate
--cumu
l
a
tive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Make
--dir
s
tat=0 output d
i
rec
t
ories tha
t
con
t
ribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Add seve
r
al tes
t
cases
f
or --
d
ir
s
tat and friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat:
In
c
ase
of renames, use target filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --
d
ir
s
tat not to co
m
pletely ignore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herla
n
d
--dirstat-by-file: Make it fast
e
r
and more correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
-
-dirsta
t
: D
e
scribe non-
o
bviou
s
dif
f
erences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Her
l
and
b
ranch/ch
e
ck
o
ut --track: En
s
ure that upstrea
m
b
r
a
nch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Her
l
and
push
.
default: Rename 'tracking'
t
o
'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge
-
-abort' as a syn
o
nym to 'git
r
e
se
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rland
c
md_merge():
Parse options bef
o
re c
h
ecking MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Provide 'git notes get-ref' to
ea
s
ily retri
e
ve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
gi
t
n
o
tes merg
e
: Add te
s
tca
s
es for merging notes
t
re
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git n
o
tes merge: Add anothe
r
auto-resolv
i
ng
strat
e
gy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
gi
t
notes merge:
--commit sho
u
ld f
a
il if
underlyi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
git n
o
t
es merge: List conflic
t
in
g
n
otes
in
notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
H
e
rland
git
notes merge: Manual
conf
l
ic
t
resolutio
n
, part
2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes m
e
r
g
e
: Manual conflict
r
esolution, p
a
rt
1
/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
Documentation: Prel
i
minary docs on
'
git
n
o
tes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git not
e
s merge: Add automatic conflict res
o
lvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Handle real, non-conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
e
r
land
builtin/notes
.
c:
Ref
a
ctor creation
of n
o
te
s
commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
gi
t
n
o
t
es m
e
rge: Initial imp
l
e
m
ent
a
tion handling triv
i
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
n
d
built
i
n
/notes
.
c: Split notes ref DWIMmery
i
nto a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
c: Us
e
two
n
e
wlines (i
n
ste
a
d of one) whe
n
c
o
ncatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
(trivia
l
)
t33
0
3: Indent with tabs i
n
stead of spa
c
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Her
l
a
nd
n
otes
.
h/
c
: Pro
p
agat
e
co
m
bine_
n
o
t
es_fn ret
u
rn value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow
combine_notes fun
c
tion
s
to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
c
:
Re
o
rder functions in preparation fo
r
next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herl
a
nd
n
o
tes
.
h: Make default_notes_ref() avail
a
b
l
e in no
t
es A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Her
l
and
(
t
rivi
a
l) notes
.
h:
M
ino
r
documentation
f
ixes to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an
Herland
notes
.
c
:
Hexify SHA1 in die() message fro
m
init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't create (empty) co
m
m
i
t when removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herla
n
d
Enable custo
m
schemes for c
o
l
u
mn co
l
ors
in the
graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
erla
n
d
Ma
k
e
graph_nex
t
_line() avail
a
b
l
e
in the gra
p
h
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
rev
i
sion: Turn off histo
r
y simplification in -
-
ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
rev
i
sion: Fix
typo in --ancestr
y
-path error m
e
ssage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Docum
e
n
t
a
t
ion/re
v
-l
i
st-options
.
tx
t
: Explain --ances
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Her
l
and
Documentation/rev
-
l
ist-optio
n
s
.
txt: Fix
missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herla
n
d
diff
.
c:
Ensu
r
e "
i
ndex $fro
m
.
.
$to
"
line contai
n
s unambig
u
ous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan H
e
rland
built
i
n-notes: Min
o
r (mostly parse_options-r
e
lated
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n Herlan
d
submodule summary: D
o
n't ba
r
f
w
hen invoked in an em
p
t
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
notes: Add "c
o
py" subcommand f
o
r copying
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Misc
.
refactoring of ar
g
c
and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
bu
i
ltin
-
notes: Add -c/-C
options
fo
r
reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
la
n
d
bu
i
ltin-notes: Refa
c
tor ha
n
dling of
-
F option t
o
allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-n
o
t
e
s
:
Depr
e
cate
the -m/-F opt
i
ons for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
H
e
r
land
builtin-notes: Add "app
e
nd" subcommand for
a
ppe
n
d
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin
-
notes
:
A
dd "add" subcomman
d
for adding
n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-not
e
s
: Add --message/--file
aliases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add "l
i
st"
subcom
m
and
fo
r
listing
n
ote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentati
o
n: General
i
ze
g
it-
n
o
t
es docs t
o
'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "prune"
s
ubcommand
for
r
emoving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
N
otes API: p
r
une_notes(): Pru
n
e n
o
tes th
a
t belo
n
g to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: V
e
rify that removi
n
g n
o
tes triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "remo
v
e" subcomman
d
for
removi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Teac
h
bu
i
ltin-notes
t
o remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
Teach notes code to
p
r
o
perly preserve non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
t3305: Verify
that adding
m
any n
o
tes with
g
it-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
l
a
nd
t3301: Verify successful annota
t
ion of no
n
-
c
ommit
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
H
e
rland
Builtin-
i
fy
git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
n
d
R
ef
a
ctor n
o
tes
conca
t
ena
t
i
o
n
i
nto a flexible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
A
l
low
m
u
l
t
i
ple concurren
t
notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: wri
t
e_not
e
s_tree(): Store t
h
e notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
Notes A
P
I: fo
r
_each_
n
ote
(
)
:
T
rave
r
se
the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: g
e
t_note(): Retur
n
the note
annotating
t
he
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API: remove_note():
R
emove note o
b
j
e
cts from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
N
o
tes API
:
add
_
n
o
t
e
(): Add note objects to t
h
e i
n
ternal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
Notes API:
i
nit_notes(): Initiali
z
e th
e
no
t
es tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Add te
s
t
s
for checking co
r
rect handling of $GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API:
get_co
m
mit_notes()
-> format_note() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Mi
n
o
r
cosmetic fixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan
Herla
n
d
built
i
n-config
:
Fix crash
wh
e
n using
"
-f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
oh
a
n Herland
Add more testcases to test fast-impor
t
of note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
rland
Ren
a
me t
9
301
to t9350, to make room for more f
a
s
t
-imp
o
rt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Her
l
an
d
fast-impo
r
t: P
r
oper notes tr
e
e manipula
t
ion
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Jo
h
an Herl
a
nd
Fix c
r
asher on e
n
coun
t
ering SHA1-
l
ike non-n
o
t
e in not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Joh
a
n Herla
n
d
Ba
s
ic build infrastruc
t
ure for Pyt
h
o
n
scri
p
ts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add
s
elftests v
e
rifying
con
c
at
e
n
ation of multiple not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Refactor
no
t
es cod
e
to concatenat
e
multiple n
o
tes
a
n
notating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
erland
Add selfte
s
ts verifyin
g
that w
e
can parse notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Her
l
and
Teach
t
he no
t
es l
o
okup code to parse notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
T
eac
h
not
e
s code
t
o
free its i
n
terna
l
dat
a
structures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add flags to get_commit
_
n
otes()
t
o control
t
he f
o
rmat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
t3302-notes-index-ex
p
ensive
:
Speed up
cre
a
te_r
e
po
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fa
s
t-impo
r
t: A
d
d support for importing com
m
it no
t
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
oha
n
Herland
Te
a
ch "-m <msg>" and "-F <file>" t
o
"git
n
otes
e
dit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan
H
e
r
land
g
it clone: Add -
-
recur
s
i
ve to automatically checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Joha
n
Herland
t7407: Use 'rev-parse --short' rather than bash's substring
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git su
b
module status: Add --recursi
v
e to r
e
c
ur
s
e
i
nto
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan He
r
l
a
nd
git
submodule upd
a
t
e
:
Int
r
oduce --recu
r
sive to update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
H
e
rland
gi
t
submodule f
o
r
each:
A
dd
-
-recursi
v
e
to recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan
Her
l
and
git submodu
l
e foreach: test acces
s
t
o
s
u
bmodule name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herland
Add selftest for 'git submodule fore
a
ch'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan He
r
la
n
d
g
i
t s
u
bmodule: Clean
u
p usage
s
tring and add option
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
J
ohan Her
l
a
nd
git
s
ubmodule for
e
ach: Pr
o
vide access
t
o submodule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Johan Herland
h
el
p
.
c: give correct s
t
ruct
u
re's size to memset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next