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
Sync with 1.8.0.1
2012-10-21
Johan Herland
git symbolic-ref --del
e
te $symre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
e
r
l
a
n
d
no
t
e
s-merge: Don't remove
.
git/N
O
TES_ME
R
GE_WOR
K
TREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
a
n
d
notes-merge:
u
se opendir/readdi
r
i
n
stead of using rea
d
_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herla
n
d
t
3
3
1
0:
i
ll
u
str
a
te fa
i
lu
r
e to "notes merge
--commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
fast-imp
o
rt: Fix incorrect fanout level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Her
l
an
d
t
9
30
1
: Ad
d
2nd testcase exposing bugs in fas
t
-
imp
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301
:
Fix testcase cover
i
ng up
a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
J
o
h
a
n Herland
t5400
:
Fix a couple
o
f
t
ypos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dir
s
tat
error me
s
sages for transla
t
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n
H
er
l
a
nd
Improve
error
h
andling when
parsing dirstat p
a
ra
m
e
t
ers
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
New
-
-
d
i
rstat=line
s
mode, doing
d
irstat
a
na
l
y
s
i
s
b
ased
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
a
nd
Al
l
o
w sp
e
cifyi
n
g --d
i
rstat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
n
d
Add config variable fo
r
spe
c
ifying def
a
ult -
-
dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an Herland
Refactor --dirstat par
s
ing; de
p
r
ecate --cumu
l
a
t
i
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make --dirstat=0
ou
t
put d
i
rectories that contribu
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several test
c
ases
for
--dirs
t
a
t
a
nd friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan H
e
rland
--dirs
t
at: In case o
f
re
n
ames, use tar
g
e
t f
i
lename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
Te
a
ch
--dirs
t
a
t not
t
o
completely
i
g
n
or
e
rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-dirsta
t
-by-
f
ile: Make it
f
aste
r
and more
correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
irs
t
at:
D
es
c
ribe no
n
-obvious differences
r
elat
i
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Mak
e
"git notes
add" more u
s
er-friendly whe
n
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Herland
log/pretty
-
options: Doc
u
ment --[no-]not
e
s and de
p
re
c
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
ohan Herland
br
a
n
ch/checkout --track: E
n
sure
that u
p
stream branc
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
ohan Herland
pus
h
.
def
a
ult: Rename 'tracking' to
'u
p
s
tream
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Prov
i
de '
g
i
t merge
-
-abort
'
as a synonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
c
md_merge(): Pars
e
op
t
ions
b
e
f
o
re checkin
g
M
ERG
E
_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erl
a
nd
Provide 'git notes ge
t
-ref'
t
o eas
i
ly retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
n
otes m
e
rge: Add
t
e
stca
s
es
for merging
n
otes t
r
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git no
t
es mer
g
e: Add another
a
uto-resol
v
ing s
t
rategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes merge: --
c
ommit should fail if unde
r
lying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Li
s
t conflicting notes in notes
m
erge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
merge: M
a
n
u
al conflic
t
resolu
t
ion, part 2/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manual con
f
lict resolution, part
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Documentation:
Preliminary
do
c
s on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add automatic
c
onfl
i
ct
resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
ote
s
m
e
r
ge: H
a
ndle r
e
al,
non
-
conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
buil
t
in/n
o
tes
.
c: Refacto
r
crea
t
ion of not
e
s comm
i
ts
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
r
land
git notes merg
e
:
Initial impl
e
mentat
i
o
n
handl
i
ng t
r
i
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
bu
i
ltin/
n
otes
.
c: Split
n
o
tes ref DWIMmer
y
i
nto a separa
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
not
e
s
.
c
:
Use two newli
n
es (instead
o
f
one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
(tri
v
ial)
t
3303:
I
nden
t
with tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
n
o
tes
.
h/c: Propa
g
ate comb
i
ne_notes
_
fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c
:
All
o
w c
o
mbine_notes func
t
ions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
c
: Reo
r
der fu
n
c
tions
i
n prep
a
rat
i
on for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rl
a
nd
note
s
.
h:
M
ake
d
e
fau
l
t_notes_ref()
available
i
n not
e
s API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
(trivial)
n
ot
e
s
.
h
: Minor documentation f
i
xes to
co
p
y_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c
: Hexify SHA1
i
n die() m
e
ssa
g
e
f
rom ini
t
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes
:
Don't create (emp
t
y
)
commi
t
w
hen rem
o
vi
n
g
n
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n Herla
n
d
Ena
b
le custom sch
e
me
s
for co
l
umn col
o
rs in th
e
graph
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Herland
M
ake graph_n
e
xt_line() avail
a
b
le i
n
the gra
p
h
.
h AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan
H
erl
a
nd
revision:
Turn off
history s
i
mplification in --
a
ncest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
rev
i
sion: Fix typo in
--
a
ncestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an H
e
r
land
Docum
e
nta
t
ion/rev-list-options
.
txt: Explain --ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n H
e
rland
Docu
m
entation/rev-list-options
.
txt:
Fix mis
s
i
n
g line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Her
l
a
nd
diff
.
c:
En
s
ure
"
index $fr
o
m
.
.
$to" line conta
i
n
s unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-notes: Minor (
m
os
t
l
y parse_options-re
l
ated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule
summary: Do
n
't barf when invoked in an
e
mpty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-
n
o
t
es
:
Add "copy"
s
ubcom
m
and for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Mi
s
c
.
refactoring of argc an
d
exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-n
o
tes
:
Add -c/-C
op
t
i
o
ns for reusing
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
builti
n
-notes: Refactor handl
i
ng o
f
-F op
t
ion to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
b
u
iltin-n
o
tes: Deprecate
t
he -m/-F
options for
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
bui
l
t
i
n-not
e
s: Add "a
p
pe
n
d" subcommand
f
or appe
n
ding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-n
o
t
e
s: A
d
d
"
add" subcommand
f
o
r a
d
ding n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
l
tin-note
s
:
Add
-
-me
s
sage/--f
i
le aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
b
u
iltin-notes: A
d
d "list
"
subcomma
n
d for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Documentation:
G
ener
a
lize git-notes d
o
cs to 'o
b
jects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
builtin-notes: Add "prune" subcomman
d
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rla
n
d
No
t
es API:
prune
_
note
s
(): Pr
u
ne n
o
tes that
belong t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t3305: Verify that removing n
o
tes t
r
iggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
builtin-n
o
tes:
Add "remove
"
subcom
m
and
for
r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Teach builtin-
n
otes
to re
m
o
v
e
empt
y
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Tea
c
h n
o
tes code
to p
r
operly preserve non-not
e
s in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t3
3
05:
V
e
r
if
y
t
hat
a
dding many notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify s
u
cces
s
f
u
l annotation of non
-
commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Builtin-
i
fy git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Refactor notes
concatenation into
a flexible inter
f
ace
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: Allow
multi
p
le co
n
current no
t
es
t
r
e
e
s wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes AP
I
:
wri
t
e_note
s
_tr
e
e(): Store
th
e
notes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
Notes
A
P
I: fo
r
_each_note(): Trav
e
rse the
entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes
API: get_note(
)
:
Re
t
urn
the note annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
No
t
e
s
AP
I
: remo
v
e_
n
ote():
R
e
m
ove note
o
bj
e
cts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
Not
e
s A
P
I: add_note(): Add note
objects to t
h
e internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
Notes
AP
I
: init_notes(): Ini
t
ialize the n
o
tes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Add tests for ch
e
cking
corr
e
c
t
h
andling o
f
$GIT_NOTES
_
REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: get_
c
ommit_notes() -> for
m
at_note() +
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Min
o
r co
s
m
e
tic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-config:
F
ix crash
when using
"-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herl
a
n
d
A
d
d
m
ore testcases to test fast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename
t
9
3
01 to t9
3
50, to make room for more fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
rla
n
d
f
ast
-
import
:
P
roper notes tree m
a
nipu
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix crasher
on e
n
c
ounte
r
ing SHA1-lik
e
no
n
-
note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan H
e
rland
Basic b
u
ild infra
s
t
r
uct
u
re for Python scri
p
ts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d selftests v
e
ri
f
yi
n
g
concaten
a
tion
o
f
multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Refact
o
r no
t
es
code
to concatenate m
u
ltiple no
t
es annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han
H
e
r
land
Add selftes
t
s verif
y
ing t
h
at w
e
c
a
n
par
s
e notes tr
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
e
rlan
d
Teach the notes l
o
okup code t
o
parse notes t
r
e
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Teach no
t
es code to
f
ree its
int
e
r
n
al
data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add flag
s
to g
e
t
_
commit_notes() to
c
ontrol
the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302-notes-i
n
dex-e
x
p
ensive: Speed
u
p
cre
a
te_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next