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
glossary: Update and rephrase the definition of a remote-tracking branch
2013-04-21
Joha
n
Her
l
and
glossary: Upd
a
t
e and rephrase
the definitio
n
o
f a
remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Her
l
and
b
ranch
.
c: Valida
t
e tracking branc
h
es with refspec
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
a
n
He
r
land
t9114
.
2: Don'
t
use -
-
track opti
o
n against
"
svn-r
e
mote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
t7
2
0
1
.
2
4: A
d
d refspec t
o
keep
-
-
track work
i
n
g
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
e
r
l
a
nd
t3200
.
39: tracking s
e
tup should fail if t
h
ere i
s
no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
checkou
t
: Use remote
r
efspecs
w
h
en DWIMming
trac
k
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
oh
a
n H
e
rland
t2024:
S
how failure to use refspec when
DWIMming remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Add tests verify
i
ng current
DWIM b
e
havi
o
r of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symbolic
-
ref --d
e
lete $sy
m
ref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herlan
d
Fix failure to delete a
p
acke
d
ref th
r
ough a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-update-ref:
A
dd
test veri
f
ying b
u
g
with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
land
notes-merge: Don't remove
.
git/NOT
E
S
_MERGE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
notes-merge: use ope
n
dir/readdir instead of u
s
ing
r
ea
d
_dir
e
c
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
a
n
Herland
t3310
:
illustr
a
te failure to "notes merg
e
--c
o
mm
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herla
n
d
fas
t
-
i
mport: Fix inc
o
rr
e
c
t
fano
u
t level when
modifyi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
t9301: Add 2nd testcase exposing bu
g
s
in
f
ast-im
p
or
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix test
c
as
e
cov
e
ring up
a
b
u
g in f
a
s
t-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
erland
t5400: Fix a couple o
f
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han
H
erland
M
a
rk dir
s
tat e
r
ror messages f
o
r
translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
I
m
pro
v
e error
h
a
ndling when parsing dirs
t
at p
a
rameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
r
land
New --dir
s
tat=lines mode, doing dirstat analysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n Her
l
and
Allow specif
y
in
g
--
d
irstat
cut-off percentage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ad
d
config va
r
i
a
ble for sp
e
cify
i
ng
def
a
ult --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Refactor --d
i
rsta
t
pars
i
ng; deprec
a
t
e
--c
u
mulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Ma
k
e --d
i
r
s
tat=0 output d
i
rectories
that contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herl
a
nd
Add severa
l
tes
t
cases fo
r
-
-d
i
rstat
and fr
i
en
d
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan H
e
rland
-
-
dirs
t
at: In c
a
se of ren
a
me
s
, u
s
e target filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
Teach
-
-di
r
stat no
t
to co
m
pl
e
tel
y
ig
n
ore rear
r
a
nged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
h
a
n Herland
--dirstat
-
by-file: Make it f
a
s
t
er
a
nd m
o
re correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
-
-dirstat: Describe non-obvious d
i
f
fe
r
ences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
Make "git
n
otes add" more user-
f
riend
l
y
when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
l
o
g/pretty-options
:
Doc
u
ment --[no-]notes
and
d
e
precate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han Herla
n
d
b
r
anch
/
checkout --track:
Ensure that u
p
stream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan
Herland
push
.
def
a
ult: Renam
e
'tracking'
t
o 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Pro
v
id
e
'git merge --abort' as
a
synonym to '
g
it
reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merg
e
()
:
Parse opti
o
ns before chec
k
ing
M
E
R
GE_HE
A
D
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
Pro
v
i
d
e 'git notes
get-
r
ef'
t
o easily retrieve
c
u
r
r
ent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git n
o
tes
m
erge
:
Add testcases for merging
n
o
t
es trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
git
notes
m
erge:
Add anoth
e
r auto-
r
e
s
olving
s
trategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merg
e
: --commit shou
l
d fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
la
n
d
g
it notes merge: List conflicting notes in notes
merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
it
n
ote
s
merge: Man
u
al conflict resolut
i
o
n
, part 2
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge
:
Man
u
al conflict
r
esolution
,
part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herl
a
n
d
Doc
u
mentation: Prelimi
n
ary
d
ocs on 'git notes merg
e
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes m
e
rge
:
Add aut
o
matic confl
i
ct
r
es
o
lvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes
me
r
ge: Handle real, non-conflic
t
ing notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Her
l
and
builtin/not
e
s
.
c: Refactor creation of no
t
es commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
H
erland
git notes
merge: Initi
a
l implementatio
n
handling trivi
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
builtin/notes
.
c: Split notes ref DWIMme
r
y into
a
separat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rla
n
d
notes
.
c
: Use t
w
o newlines (inst
e
a
d
of one) whe
n
c
o
ncat
e
natin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(triv
i
a
l
) t3303: Indent with tabs instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
notes
.
h/c:
Propaga
t
e co
m
bin
e
_notes_fn re
t
urn value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
h/c: Allow comb
i
ne_notes fun
c
tions to remov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
no
t
es
.
c
: Reorder fun
c
t
i
ons in prepa
r
a
t
ion for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
lan
d
notes
.
h:
Mak
e
default_notes_ref() available in notes
A
PI
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herl
a
nd
(tr
i
vial
)
notes
.
h: Mino
r
do
c
umentation fixes to copy_n
o
tes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
e
rland
notes
.
c: Hexify SHA1 in d
i
e
()
message from init_no
t
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't cr
e
ate (emp
t
y) c
o
mmit wh
e
n removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Herland
Enab
l
e custo
m
sch
e
m
e
s
for column
colors in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make gra
p
h
_ne
x
t_line() available in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
ev
i
sion: Turn
off his
t
ory simplific
a
tion in
--ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
n
d
r
evision:
F
ix
typo in --ancest
r
y-path error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
ocumentat
i
on/rev-list-
o
ptions
.
txt: Expla
i
n
--ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an
Herl
a
nd
Doc
u
mentation
/
rev-li
s
t-option
s
.
txt
:
Fix
m
iss
i
ng line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
dif
f
.
c: Ens
u
re "
i
ndex $fr
o
m
.
.
$to" l
i
n
e contains unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan He
r
land
builtin-no
t
es: Minor (mos
t
ly pa
r
se_o
p
tions-
r
el
a
ted
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule s
u
mmary: Don't barf when in
v
oked in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
b
u
i
ltin-notes: Add "copy" sub
c
omma
n
d for co
p
ying
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s: Misc
.
refactoring of
a
r
g
c and
e
xit va
l
u
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes:
A
d
d
-c/-C options for reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Refa
c
tor ha
n
dling of -F option t
o
allo
w
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
uilt
i
n-notes: Depr
e
cate the -m/-F options
f
or
"
git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
bu
i
ltin-notes: Add "append" subcommand for appen
d
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes: Add "add"
subcommand f
o
r addi
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Add --me
s
sa
g
e
/
--file aliases for
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uilti
n
-
n
otes: Add "list" sub
c
ommand for listing
n
ote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
D
ocu
m
e
n
tation: Generalize git-notes docs
t
o
'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-no
t
e
s:
Add
"
prune" subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: prune_
n
otes(): Prune no
t
es that be
l
o
ng to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
t330
5
: Veri
f
y
t
hat
remo
v
in
g
notes triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
b
uiltin-
n
otes
:
Add "
r
emo
v
e" subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
builtin-note
s
to r
e
m
ove
e
mpty
not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
each notes code to properly pres
e
rve non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
t3
3
05: Ve
r
if
y
that adding
m
an
y
notes with git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t3301: Verif
y
s
uccessful annotation
o
f
n
on-comm
i
ts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
B
uil
t
i
n
-i
f
y gi
t
-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refac
t
or
not
e
s concatenation into
a flexible
i
nte
r
face
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
Not
e
s API: Al
l
o
w
mu
l
t
i
p
l
e
c
oncurrent notes trees wit
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
write
_
notes_tree(): Store
t
h
e
notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I
:
f
o
r_each_note(): T
r
a
verse
the
entire
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes
A
P
I
:
get
_
no
t
e(): Return the note annota
t
ing
t
he
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s
A
PI: re
m
ov
e
_note
(
): R
e
move note objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
No
t
e
s
API: a
d
d_note
(
): Add note
o
bjects to the intern
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
N
o
t
es
A
PI: in
i
t_no
t
es(): In
i
t
ialize the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Add tests for
checking c
o
rrect ha
n
d
l
ing o
f
$
GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
la
n
d
No
t
es API: get_c
o
mmit_notes() -> fo
r
mat_note() +
r
e
m
ove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Minor cosmetic
f
ixes
t
o n
o
te
s
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-config: Fix
c
r
ash wh
e
n usi
n
g
"-f <rela
t
i
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
He
r
la
n
d
Add more testcase
s
t
o test fast-import of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
Rename t9301 to t9350,
t
o ma
k
e room for m
o
re fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next