repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
2013-04-21
J
ohan Herland
branc
h
.
c
: Validate tracking branches wit
h
refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
h
a
n Herland
t9114
.
2: Don't use --track option against
"
svn-r
e
m
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han He
r
l
a
nd
t7201
.
24: A
d
d refspec
to keep --track
working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
t3200
.
39: tracking setup should fail if there is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
che
c
kou
t
:
U
s
e
remote
r
efspe
c
s when D
W
IMming
t
r
acking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herla
n
d
t2024: Show failure to use refs
p
ec whe
n
DWIMming
r
emote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Her
l
and
t2024:
Ad
d
tests verifying current DWIM beh
a
vior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
g
it
s
y
mbolic-ref
-
-delete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
Fix
f
a
i
lure to delete
a packed ref through a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-update-
r
ef: Add test v
e
rifyin
g
b
u
g with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes
-
merge: Don't remov
e
.
git/NOT
E
S_M
E
RGE_WO
R
KTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herla
n
d
notes-merge: use
o
p
e
ndir/readdir ins
t
ea
d
of using read_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
t3
3
10: illust
r
ate failure to "notes me
r
g
e --co
m
mit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
fast-import: Fix
i
ncorrect fanout
level
w
hen modify
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herland
t9
3
01: A
d
d 2
n
d testcase ex
p
osing bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301
:
Fix
t
est
c
a
s
e covering up
a bug in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herl
a
nd
t5400: Fix a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark
d
irstat error messages for translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Im
p
rove error
h
andl
i
ng wh
e
n parsing dirstat
p
ara
m
ete
r
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --di
r
s
tat=lines mode, doing dirstat anal
y
s
i
s b
a
sed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Allow specifyi
n
g --dirst
a
t cut-off percentage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan He
r
land
Ad
d
con
f
i
g
variable for sp
e
cifying d
e
fault
-
-dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Re
f
actor --dirstat parsi
n
g; deprecate --
c
u
mulativ
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Ma
k
e --dirstat=
0
output directorie
s
that contribut
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Add
s
e
v
e
r
al test
c
ases f
o
r -
-
dir
s
tat
and frien
d
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n
Herland
--dirstat:
In case of rename
s
,
use targe
t
filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han
H
erla
n
d
Teach --dirstat
no
t
to completely ignore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--d
i
rstat-
b
y-file: Make it faster an
d
more correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat:
Describe
non-obvious
d
ifferences rela
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
Mak
e
"git notes add" more user-friendly w
h
e
n
there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
o
h
an
H
erland
lo
g
/
p
retty-options:
D
oc
u
ment --[no-]notes and depre
c
a
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han He
r
land
bra
n
ch/
c
hecko
u
t
-
-track:
E
nsure that
u
pstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan H
e
rland
push
.
d
e
fault:
Rename 'tracking' to 'upstream
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
Pro
v
i
d
e
'
g
it merge --abor
t
' a
s
a synonym to 'g
i
t
reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
c
m
d
_
m
e
r
ge(): Parse options before
checking MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
Provide
'
git notes get-ref' t
o
e
a
s
ily
r
etriev
e
current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes
merge: Add
testcases fo
r
m
e
rging
notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge: Add another auto
-
r
e
solving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
git no
t
es merg
e
: --co
m
mi
t
s
hould fai
l
i
f
underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List c
o
n
f
licting notes in no
t
es merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git
n
otes m
e
rge:
M
anual conflict resoluti
o
n
,
pa
r
t 2/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
H
erland
git n
o
tes m
e
rge:
Manual conflict resolutio
n
,
part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
Documentation
:
Pre
l
iminary d
o
cs on 'git notes
merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
git notes merge: A
d
d
a
u
t
omatic conflict re
s
olvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: Hand
l
e real, non
-
c
o
nflictin
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
u
iltin/notes
.
c: Refac
t
or c
r
eation of
n
ot
e
s com
m
its
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
i
t notes merge:
Initial imp
l
ementation handling tri
v
ial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bui
l
ti
n
/notes
.
c: Split notes ref DWIMmery in
t
o a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
notes
.
c: Use two newli
n
es (inst
e
ad
of one) whe
n
conc
a
t
e
natin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3303: Indent with tabs instead o
f
sp
a
ces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
n
o
tes
.
h/c:
Propagate
comb
i
ne_no
t
es_fn return va
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
notes
.
h/c: Allow combine_notes
func
t
i
o
ns to remov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
erland
notes
.
c
:
R
eorder functions in
pr
e
paration for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
note
s
.
h: Make
d
efaul
t
_notes_ref() ava
i
lable in notes AP
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h: Minor d
o
cumentation fixes to cop
y
_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
c: H
e
xify SH
A
1 in d
i
e()
message from init
_
notes(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes:
Don'
t
crea
t
e (empt
y
) co
m
m
i
t when removing no
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
a
n
d
E
n
a
b
le
c
ustom schemes for co
l
umn colors in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han
Herland
M
ake graph_next_l
i
ne() ava
i
labl
e
in t
h
e graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
re
v
i
s
ion: Turn off history simplification i
n
--ance
s
t
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: F
i
x
typo
in --an
c
estry
-
path e
r
ror
m
e
ss
a
ge
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
D
ocumentation/rev-lis
t
-options
.
txt:
E
xp
l
ain --ances
t
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herl
a
nd
Documen
t
ation/rev-list-options
.
txt: Fix missing lin
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n Her
l
a
n
d
d
if
f
.
c: Ensure "i
n
dex $from
.
.
$to" lin
e
contains una
m
bi
g
uous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan Herland
builtin-note
s
: Minor (mos
t
l
y
parse_options-rel
a
t
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Her
l
and
su
b
module summ
a
ry: Do
n
't barf whe
n
invoked
in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add "cop
y
" su
b
c
ommand for copy
i
n
g not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: Misc
.
refacto
r
i
n
g
o
f argc and exit
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
built
i
n-notes: Add -c/-C o
p
t
ions for
r
eusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes: Refacto
r
h
andling
o
f -
F
o
p
t
ion to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
uiltin-n
o
te
s
: Deprecate
t
he -m/-F options for
"git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builti
n
-no
t
es:
A
d
d "append" subcommand for
a
ppendin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rla
n
d
builtin-n
o
tes: Add "add" subcommand
f
or
a
dding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herl
a
nd
builtin-notes:
Add --message/--fi
l
e aliases f
o
r
-
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
n
d
buil
t
i
n-
n
o
t
es: Add "list" subcommand for li
s
ting n
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
Do
c
u
m
entatio
n
:
G
en
e
ralize git-no
t
es docs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builti
n
-
n
otes: Add "
p
rune"
s
ubcomma
n
d for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
A
PI: prune_no
t
es()
:
P
ru
n
e notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify th
a
t removing notes trigge
r
s automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
built
i
n-notes: Add "remove" su
b
c
o
m
m
and for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Teac
h
builtin-notes to remove empty no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Te
a
ch
note
s
c
ode to properly p
r
ese
r
ve n
o
n-notes
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
t3305: Ver
i
fy that a
d
ding man
y
notes with git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
t330
1
: Veri
f
y successful annota
t
i
o
n of non-comm
i
ts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Builtin-ify gi
t
-
n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Refactor not
e
s
c
oncaten
a
tio
n
into a flexi
b
le i
n
terface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Note
s
API:
Allow multiple concurren
t
notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herl
a
n
d
Notes A
P
I: write_notes_tree
(
): Store the notes tr
e
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI: for_each_no
t
e():
T
raverse the
e
ntire
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_not
e
(): Re
t
urn t
h
e note annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
n
d
Notes API: remove_note(): Remove
n
ote objects fr
o
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
Note
s
API: add_no
t
e(): Ad
d
n
o
te obje
c
ts to
th
e
internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
Notes API: init_notes(): Initialize the no
t
es
tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Add test
s
f
or
checking co
r
rect handling of $GI
T
_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
No
t
e
s
API: ge
t
_co
m
mit_notes()
-
> format_note() + r
e
move
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Minor cosmetic fixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-config:
Fix crash whe
n
usin
g
"-f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
Add more testca
s
es to test fast-import of n
o
te
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rena
m
e
t
9301 t
o
t9
3
5
0
, to make room
f
or more fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herland
fast-import: Pr
o
per n
o
tes tree manip
u
lation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next