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
t7201.24: Add refspec to keep --track working
2013-04-21
J
o
han Herla
n
d
t7201
.
2
4
: Add
refs
p
ec to keep --
t
rack workin
g
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t3200
.
3
9: track
i
ng set
u
p
should fai
l
if there i
s
n
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
oha
n
Herland
ch
e
cko
u
t: Use remote refspec
s
when DW
I
Mming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t
2
024: Show failure to u
s
e
r
e
f
s
p
e
c
w
hen DWIMming rem
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
H
e
rland
t2024: Add tes
t
s verifying current DWIM
behavi
o
r of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
git sy
m
bo
l
ic-r
e
f --delete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erland
F
i
x
fa
i
lure to d
e
lete a
p
a
c
k
e
d
ref t
h
rough a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herlan
d
t
1400-upd
a
te-r
e
f: Add
t
est verifying bug
wi
t
h s
y
mrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
n
o
t
e
s
-merge: Don't remove
.
git/NOTES_MERGE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
erland
n
otes
-
merge: us
e
open
d
ir/readdir in
s
tea
d
of using read_
d
irec
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
t3310:
i
llust
r
a
t
e failure to "notes merge
-
-com
m
it
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herla
n
d
fa
s
t-import
:
Fix inco
r
rec
t
f
a
nout
l
evel when modif
y
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t9301: Add 2nd
t
estcase e
x
posing bugs i
n
fast-imp
o
rt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9
301: Fix testc
a
se covering u
p
a bug in f
a
st-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Herland
t5
4
00: Fix a couple o
f
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
erland
Mark dirstat error messages
f
or
translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
oha
n
Her
l
and
Improve error hand
l
ing
w
hen par
s
in
g
dirstat parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
er
l
and
New
--dirstat=lines
mode, d
o
ing dirstat
analysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herla
n
d
A
l
low specif
y
i
ng --di
r
stat cut-off percentage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
H
e
rland
A
dd config variable f
o
r specifyi
n
g
defaul
t
-
-d
i
rs
t
a
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
R
efactor --dir
s
tat parsing; deprecat
e
--cumulativ
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make --dirsta
t
=0 outpu
t
directories that cont
r
ibute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herla
n
d
Add several tes
t
cases for --
d
irstat
a
nd
f
r
i
ends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
Herland
--d
i
r
stat: In case of
rename
s
, use ta
r
get f
i
lename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
h
an Herland
Tea
c
h --dirstat not to complet
e
ly
i
gnore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
d
i
rstat-by-fil
e
: Make it
f
a
ster a
n
d
more correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--d
i
rstat: Des
c
ribe
non-obvio
u
s differe
n
ces relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
erland
Make "git notes add" m
o
re user-f
r
iendl
y
when ther
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herl
a
nd
l
o
g/pr
e
tty-o
p
tions
:
D
o
cument --[no-]n
o
tes and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Her
l
and
bran
c
h/chec
k
o
u
t --track: Ensure
that u
p
stream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n Herland
p
u
s
h
.
default: Rename 'tracking'
t
o 'ups
t
ream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Provide 'git merge --ab
o
rt' as a
syn
o
nym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
cmd_merge(): Pa
r
se opti
o
n
s befo
r
e checking MERGE
_
H
EAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Pro
v
ide 'git notes
g
et-ref' to easily retr
i
eve
current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: Add testca
s
es for merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge
:
Add
a
nothe
r
au
t
o-r
e
sol
v
ing strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
l
and
git notes merge: --commi
t
should fail
if underlyin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge
:
List confli
c
ting
notes
i
n notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Her
l
and
gi
t
note
s
mer
g
e
:
Manual confl
i
c
t
r
esolution
,
part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes mer
g
e: M
a
nual conflict resolution,
p
art 1
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documen
t
ation: P
r
eliminary
d
ocs on 'git notes m
e
rge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
e
s
merge: A
d
d au
t
o
m
at
i
c
conf
l
i
ct re
s
olv
e
rs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
g
it notes
m
e
r
ge: Handle real, non
-
conflicting
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
b
uiltin/n
o
tes
.
c
: Refactor
c
reation of notes comm
i
ts
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
g
i
t
notes merg
e
:
Initial
i
m
p
l
e
mentation handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
builtin/notes
.
c: Sp
l
it notes 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
n
ote
s
.
c: Use
t
wo newli
n
es (instea
d
o
f one) wh
e
n concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(trivial)
t
3303: Ind
e
nt with tabs i
n
st
e
ad of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
no
t
es
.
h/c:
Prop
a
g
ate
combine
_
notes_fn
return va
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
h
/c
:
Allow co
m
b
ine_note
s
functi
o
n
s
to
r
e
m
o
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n Herla
n
d
notes
.
c: Reorder fu
n
ctions in preparati
o
n for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make default_notes_ref() avai
l
able in no
t
es A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan He
r
land
(trivial) notes
.
h: Minor docu
m
e
ntation fixes to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herland
notes
.
c: Hexify
S
HA1 in
d
ie() messa
g
e from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
He
r
land
n
o
tes
:
D
o
n't create (empty) commit when re
m
oving
n
on
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
J
o
h
an Herland
E
nabl
e
cust
o
m schemes for col
u
mn co
l
ors
i
n
the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n
H
er
l
and
Mak
e
grap
h
_
n
e
xt_line
(
) available i
n
the graph
.
h AP
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
revi
s
io
n
:
T
urn
off h
i
s
tory simplificati
o
n in --an
c
estry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix typo in -
-
a
n
c
est
r
y-path error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
Documentat
i
on/rev-l
i
st-options
.
t
x
t: Explain -
-
ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Doc
u
mentation/rev-list
-
options
.
txt: Fix missin
g
line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan
H
erland
di
f
f
.
c:
E
nsure "inde
x
$
f
rom
.
.
$to" l
i
n
e contains unam
b
i
g
uo
u
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-not
e
s: Minor (mos
t
ly parse_options-relat
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han H
e
rla
n
d
s
u
bmodule summary: Don
'
t barf when
invoked in an e
m
pty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "cop
y
" subcommand
f
or
copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: Misc
.
ref
a
ctoring of argc and
e
xit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add
-c/-C op
t
ion
s
for reus
i
ng notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
l
tin
-
notes: Refa
c
tor
h
a
n
dling of -F opti
o
n to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
D
eprecate the -m/-F op
t
ions for
"g
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
builtin-notes:
A
dd "app
e
nd" subcommand
f
or appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
bui
l
tin-
n
otes: Add "add" sub
c
ommand for
adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes: Add --message/--file
ali
a
se
s
for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes
:
Add
"list"
subcomm
a
nd for lis
t
ing
n
o
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
Documentation: Ge
n
eralize gi
t
-note
s
docs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d "pr
u
ne
"
su
b
command for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Note
s
AP
I
:
prune_note
s
(): Prune notes
t
hat belo
n
g
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
3
0
5: Verify that rem
o
vi
n
g
n
o
tes triggers autom
a
tic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes: Add
"
remove" subcomma
n
d fo
r
remo
v
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Her
l
an
d
Teach builti
n
-not
e
s to remove emp
t
y
not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Te
a
ch notes code
t
o properl
y
prese
r
v
e
non-no
t
es in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
l
a
nd
t3305
:
Verify that adding m
a
ny
notes
with git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
t
3301
:
Verify succes
s
ful annotat
i
on of n
o
n-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-ify git-not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Refactor notes concatenation into a fl
e
xible interfac
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes API:
All
o
w
m
u
ltiple concurren
t
n
otes
t
rees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es API: write_
n
otes_tree(): Stor
e
the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
Notes API: for_eac
h
_note
(
): Tr
a
ver
s
e
the entire n
o
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: get_note(): Return the note a
n
not
a
t
i
ng the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes A
P
I: remo
v
e_
n
o
te(): Remove note
objects
f
r
o
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: add
_
not
e
():
A
d
d note
obje
c
ts
to the i
n
ternal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
in
i
t
_n
o
tes(): Initialize th
e
notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
A
d
d tests for
checki
n
g
correct h
a
ndling of $GIT
_
NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
No
t
es API:
g
et
_
co
m
mit_note
s
()
-> format
_
n
o
te
(
) + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
a
n
d
Mino
r
cosme
t
ic fixes to note
s
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
buil
t
in-co
n
fig: Fix crash when using "-f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herl
a
nd
Add
m
ore testcases to te
s
t
fast-
i
mport of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herla
n
d
Rename t930
1
to t93
5
0
,
t
o ma
k
e room
f
or more fast-impor
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-import: Proper notes
t
ree manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan
Herland
Fix crasher
o
n e
n
countering SHA1-l
i
ke no
n
-n
o
t
e in
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
an Herland
Basic bui
l
d infras
t
ruct
u
re
for Python scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next