repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Start preparing for 1.8.0.2
2012-10-21
Joha
n
Herland
F
i
x
fail
u
re to delete a p
a
cked ref through a
s
y
m
ref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan H
e
rland
t14
0
0-upda
t
e
-ref
:
Add test
ve
r
ifyin
g
b
u
g
with
s
ymrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
erland
notes-merge: Don't remove
.
git/NOTES_MERGE_
W
ORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: u
s
e opend
i
r/readdir instead
o
f
using read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n H
e
rland
t3310: illu
s
tr
a
t
e failure to
"notes me
r
ge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
e
r
l
a
n
d
fast-import:
F
ix incorrect fanou
t
level when modifyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han
H
er
l
a
nd
t93
0
1: Add 2nd
t
est
c
ase ex
p
osing bugs
in fast-imp
o
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
t9301:
Fix test
c
a
s
e c
o
veri
n
g up a bug in f
a
st-imp
o
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
H
e
rland
t
5
400
:
Fix
a
c
ouple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Mark dirstat error messa
g
es for
t
r
a
nslation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herla
n
d
Improve error hand
l
ing when parsi
n
g dirstat
parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Ne
w
--dirs
t
a
t
=li
n
es mode,
d
oin
g
dirstat an
a
lysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specify
i
ng
-
-di
r
sta
t
cut-o
f
f
percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
d
d c
o
nfig variable for specifying defa
u
lt --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Refa
c
tor --di
r
st
a
t parsin
g
; depreca
t
e --cumu
l
ativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Make --di
r
stat=0 output director
i
e
s that
contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add sev
e
ral tes
t
ca
s
es fo
r
--
d
irs
t
a
t
a
n
d
fr
i
e
n
ds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
a
n
Herland
--dirstat: I
n
case of r
e
names,
u
se target
f
ilename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herl
a
nd
Teach --dirstat n
o
t to completely ignor
e
rearrang
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
-
-dirst
a
t-b
y
-
f
ile: Make it fa
s
ter
a
nd more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
dirs
t
at
:
Describe no
n
-obv
i
ous diffe
r
ences r
e
lative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "
g
it
n
otes
a
dd" mor
e
user-friendly whe
n
the
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
Herland
l
o
g/pret
t
y-options: Document --[no-]
n
otes and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an Herland
branch/ch
e
ckout
--track: Ensure t
h
at
u
pstream bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
d
e
fault: Rename '
t
racki
n
g' to 'up
s
tream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
Pr
o
vide
'git merge --abort' as a
s
ynony
m
t
o 'git
rese
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
cmd_merge()
:
Parse
op
t
ion
s
before c
h
ecking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Pr
o
vide 'gi
t
notes get-ref' to
e
asily retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge: Add testcases fo
r
m
e
r
ging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
nd
git notes
merge: Add a
n
other auto-resolvi
n
g
s
t
rat
e
gy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
lan
d
git
n
otes me
r
ge:
-
-commit
s
hould
fail if under
l
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
g
i
t notes merge: List conflictin
g
notes in
notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git n
o
tes merg
e
: Manua
l
conf
l
ict r
e
solution, p
a
r
t
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merge: Ma
n
ual conflict r
e
solution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documen
t
a
t
ion: Preliminary docs on 'gi
t
notes m
e
rg
e
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes mer
g
e: Add automatic
c
onflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merge: Handle rea
l
,
non
-
con
f
licting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herlan
d
builtin/note
s
.
c: R
e
fa
c
tor creation
o
f n
o
tes com
m
it
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
lan
d
git notes m
e
rg
e
: Initial impl
e
men
t
ation handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
ui
l
t
in/n
o
tes
.
c: Split
n
otes ref DW
I
M
mery
into a separat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use two
n
e
wlines (instead
o
f one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herland
(
t
ri
v
ial
)
t3303: Indent with
t
ab
s
instea
d
of spa
c
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
notes
.
h/
c
: Prop
a
gate combine_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
note
s
.
h/c: Allow com
b
ine_notes
functions to
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
c: Reorde
r
f
unc
t
ions i
n
preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make
d
efault_notes_ref() available in notes
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
(tri
v
ial)
no
t
e
s
.
h
:
Minor d
o
cumentati
o
n fixe
s
to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
H
erl
a
n
d
not
e
s
.
c:
H
exi
f
y SHA1
i
n
d
i
e
(
)
message fr
o
m init_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herla
n
d
notes: Don't c
r
eate (empty) commit when r
e
moving n
o
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
E
n
a
ble custom
schemes f
o
r column co
l
or
s
in the graph
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
M
a
k
e
graph_next_line() available in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n He
r
lan
d
rev
i
s
i
on: T
u
r
n
off histor
y
simplification i
n
-
-
an
c
es
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fi
x
typ
o
in -
-
ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
D
o
cumentation/rev-list-options
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
D
o
cument
a
tion/r
e
v-list-options
.
txt: F
i
x
m
issing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joha
n
He
r
land
d
i
ff
.
c: En
s
ure "inde
x
$
from
.
.
$to" line
contains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Joha
n
H
erland
builtin
-
notes:
Minor (mostly
parse_optio
n
s
-
related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan H
e
r
l
and
sub
m
od
u
le
s
ummary: D
o
n'
t
barf when invo
k
ed in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Ad
d
"copy" subcommand for
copyin
g
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
ot
e
s: Misc
.
r
e
factori
n
g of argc and exit
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-no
t
es: Add -c/-C options for
reusing not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-no
t
e
s: Refactor
handlin
g
of
-F o
p
tion to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
builtin-notes: Deprecate the -m/-F options for "
g
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes:
A
dd "appe
n
d"
s
u
bcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: A
d
d "
a
d
d" subco
m
mand for a
d
din
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
l
a
nd
builtin-not
e
s
:
A
dd --me
s
sage/--file aliases
f
o
r -
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n He
r
la
n
d
b
uiltin-n
o
t
e
s:
A
dd
"
l
i
st" subcom
m
and for listi
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
D
o
cumen
t
a
t
ion: G
e
neralize git-n
o
tes do
c
s to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
b
u
iltin-n
o
tes:
A
d
d "
p
rune" s
u
bcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
e
rl
a
nd
N
otes
A
PI:
prune_note
s
(
)
: Pr
u
n
e notes that
b
elong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rl
a
nd
t3305: Verify that removing note
s
triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
bu
i
ltin-notes: Add "r
e
move" subcommand for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach builtin-no
t
e
s to r
e
move empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Tea
c
h
no
t
es code to pro
p
er
l
y prese
r
ve
n
on-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t33
0
5: Verify that addin
g
many
n
o
tes w
i
th
git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t3301: Verify s
u
ccessful annotation of non
-
commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
Builtin-ify
g
it-not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
Refactor notes conc
a
tena
t
ion
i
nto a flexi
b
le interf
a
c
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes A
P
I: Allow multiple concu
r
rent
n
o
tes trees wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API:
w
rite_notes_tree():
S
tore the notes
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes API: for_each_note(): Travers
e
th
e
entire
n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
No
t
es
A
P
I
: get_no
t
e
(
): Return the
n
ote annota
t
ing the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes API: rem
o
ve_note(): Remo
v
e note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
l
a
n
d
Notes A
P
I
: add_
n
ote(): Add no
t
e obje
c
ts to the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
Notes API: init
_
notes(): Initialize
t
he
n
otes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Add tests f
o
r
ch
e
cki
n
g
c
orre
c
t
h
andling of $GI
T
_NOTE
S
_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
a
n
d
Notes AP
I
: get_commit_
n
otes() ->
f
o
rmat_note()
+
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
n
d
Minor
cosmetic fixes to note
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
ohan Herlan
d
builtin-c
o
n
fig: Fi
x
crash when using "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
r
land
Add more
t
es
t
cases to tes
t
fast-
i
mport of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
Herland
Rename t930
1
to
t9350, to make room for more
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Her
l
an
d
f
ast-i
m
port:
P
rope
r
notes tree
manipu
l
atio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joha
n
Herland
Fix crasher on encountering SHA1-like
non-note in
n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Bas
i
c
build
i
n
frast
r
u
cture f
o
r P
y
th
o
n scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add selftests
v
e
r
if
y
ing concatenation of multi
p
le
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han H
e
rland
Refa
c
tor
n
otes code to concatenate multi
p
le no
t
es a
n
not
a
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d sel
f
test
s
verifying that we can pa
r
s
e notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herla
n
d
T
eac
h
the
n
otes look
u
p code to parse n
o
tes tree
s
w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erl
a
nd
Te
a
ch
not
e
s
c
ode t
o
f
r
ee it
s
internal d
a
ta
structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add flags to get_commit_n
o
tes() to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next