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
Merge branch 'jh/checkout-auto-tracking' into maint
2013-09-09
Johan Herland
t3200: Add tes
t
demonstrating minor
r
egression in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
er
l
and
Refer t
o
bra
n
ch
.
<name>
.
remote/merge when documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
ohan Herl
a
n
d
t
3
200: Mino
r
fix when
p
repa
r
i
n
g
for trac
k
ing
failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erland
t2024: Fix &&-c
h
ain
i
ng and a
c
ouple o
f
typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Her
l
and
M
ov
e
cre
a
t
e_notes_commit
(
)
f
r
om notes
-
merge
.
c int
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an H
e
rl
a
nd
Move co
p
y
_note_for_
r
ewrite + friends fro
m
bu
i
lti
n
/
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_copy_
n
otes_for_rewr
i
t
e
():
L
e
t
c
a
l
ler pr
o
vide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
l
a
nd
glossary: Update and rephras
e
the definition o
f
a remo
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c
:
Validate tr
a
c
ki
n
g bran
c
hes with
refspec
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t9114
.
2: Don't use --track
opt
i
on aga
i
nst "sv
n
-re
m
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
H
er
l
an
d
t7201
.
24: Add r
e
f
s
pec to
k
e
ep --track worki
n
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3200
.
39: trackin
g
setup
should fail
i
f there is
n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
checkout: Use remote refspecs whe
n
D
W
I
Mming
tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t202
4
: Show failure to use re
f
spec when DWIMming rem
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Add tests verifying current DWIM behavior
o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
nd
git symbolic-ref --delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erland
Fix failure to
d
elete a pa
c
ked r
e
f through a symr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
oha
n
Herland
t
1
40
0
-
u
pdate-ref
:
Add
t
e
st verif
y
ing bug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: Don't
remove
.
gi
t
/NOTES
_
MERGE_WO
R
K
T
REE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herland
notes-merge
:
use opendir/
r
eaddir instead 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
erland
t
3310: ill
u
strate
f
a
i
lure to "notes
m
erge --commi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erland
f
a
st-imp
o
rt
:
Fi
x
incorrect fanout l
e
vel
w
hen mo
d
ifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
a
nd
t9301
:
A
d
d 2nd testc
a
se exposing bugs
in fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rl
a
nd
t9301: Fix te
s
tcase c
o
ve
r
ing up a bug in fa
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a c
o
up
l
e of typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
H
erland
Mark dirstat error messa
g
e
s for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve
er
r
or handling when
p
arsing dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n
Herland
Ne
w
-
-dirstat=lines mode, doing di
r
stat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Allow specifying --dirstat cu
t
-off per
c
entage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Add
c
onfig va
r
iable fo
r
specifying de
f
ault
-
-di
r
s
ta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Re
f
actor --
d
i
rstat parsing; deprecate --
c
umulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Make --d
i
rstat=0 output dir
e
cto
r
ies
that c
o
ntribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
sev
e
ral
t
e
s
tcases for --d
i
rs
t
a
t and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan
Her
l
a
nd
--dir
s
tat: In c
a
s
e
of renames, use target filena
m
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rland
Teach --di
r
stat not to co
m
pletely ig
n
or
e
rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--dirstat-by
-
file: Make it faster an
d
mo
r
e co
r
rec
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
irstat:
D
esc
r
ibe non-obvious differ
e
nce
s
r
e
l
a
t
i
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
h
a
n
H
e
rland
Make "git not
e
s
add"
more use
r
-f
r
iendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan H
e
rland
log/pretty-opti
o
ns: Docu
m
e
n
t --[no-]notes and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
o
h
an
Herland
branch/chec
k
out --tra
c
k: Ensure that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default: Rename
'
tracking' to 'upstre
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge --abo
r
t' as a sy
n
onym to
'
g
it
r
eset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
cmd_merge(): Pa
r
se op
t
ions b
e
fo
r
e checking MERGE_H
E
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
P
r
ovid
e
'git n
o
t
es get
-
r
ef' to
e
asily
r
etrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git n
o
tes merge: Ad
d
testcases for merg
i
ng n
o
tes t
r
e
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
rland
g
it notes merg
e
: Add an
o
t
he
r
a
u
to-resolving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
-
-com
m
it s
h
ou
l
d fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes merg
e
: List
conflicting
notes
i
n notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it
n
o
tes merge:
M
a
nual confli
c
t resolution
,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge:
Manual conf
l
ict
resolu
t
ion, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
n
d
Documentation: Preliminary
d
ocs on 'g
i
t notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git note
s
merge:
A
dd automatic conflict resol
v
e
rs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
e
s m
e
r
g
e: Handle rea
l
, non-conflicting
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/not
e
s
.
c: Refa
c
tor cr
e
a
tion of notes comm
i
ts
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t n
o
tes merge: I
n
i
t
ial implem
e
ntatio
n
handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erland
builtin/notes
.
c: Split notes ref DWIMmery
into
a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erland
notes
.
c
:
Use two newli
n
es
(
instea
d
of one)
w
hen concaten
a
tin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(triv
i
al) t3303: Indent with t
a
bs instea
d
o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herlan
d
notes
.
h/c:
Propagate combine_notes_fn retur
n
val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
note
s
.
h/
c
:
A
l
l
ow comb
i
ne_n
o
tes
funct
i
o
ns to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
c: Reorder functions in pr
e
paration
for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
h: Make default_notes_ref
(
)
ava
i
labl
e
in
notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
t
rivi
a
l) notes
.
h: M
i
nor documentatio
n
fix
e
s to copy_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erla
n
d
n
otes
.
c: H
e
xif
y
SHA
1
in die() messag
e
from i
n
it_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan H
e
r
l
and
notes: Don't cr
e
at
e
(empty) commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
er
l
a
n
d
Enable c
u
stom
s
che
m
es for
column
c
olors i
n
the gr
a
ph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herland
Make graph_next_line()
available in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan
Herland
revision: Turn of
f
history simplifi
c
ati
o
n in --ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix
typo in --ance
s
try-pa
t
h error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
D
o
cume
n
tation/
r
ev-
l
ist-o
p
tio
n
s
.
txt: E
x
plain --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 miss
i
ng line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan He
r
land
di
f
f
.
c: Ensure
"
index $from
.
.
$to" line contain
s
unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Joha
n
Herland
builti
n
-
n
otes
:
Mi
n
or (mostly par
s
e_o
p
tions-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n Herland
sub
m
odu
l
e summa
r
y: Do
n
't barf when i
n
voked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes: Add "copy
"
s
u
bco
m
m
an
d
for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herl
a
n
d
builtin
-
note
s
: Misc
.
refa
c
tor
i
n
g of argc an
d
exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n H
e
rlan
d
builtin
-
n
ote
s
:
Add -c/-C
o
ption
s
for
reusing
not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
built
i
n-not
e
s: Refactor handling of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
nd
builti
n
-
n
otes: Depr
e
cat
e
the -m/-F op
t
ions fo
r
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
buil
t
in-note
s
: Add
"a
p
pend" subco
m
mand for app
e
n
d
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d "add"
s
ubc
o
mmand for addi
n
g no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
buil
t
in-notes: A
d
d --message/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
l
tin-notes:
Add "l
i
st" subc
o
mmand for
l
isting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Do
c
umentation: Ge
n
eralize git-notes docs to 'obj
e
cts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
builtin-notes: Add "p
r
u
ne" s
u
b
c
omma
n
d f
o
r removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
N
otes API: p
r
une_notes(): Prune notes that b
e
long to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t
3305: Ver
i
f
y
t
hat removi
n
g not
e
s triggers
auto
m
atic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
bui
l
tin-notes: Add "rem
o
ve" subcomman
d
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
b
uilt
i
n
-
notes
t
o re
m
o
v
e empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes code
to pro
p
er
l
y prese
r
ve non-notes
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t3305: Verify t
h
at adding ma
n
y
n
otes wi
t
h git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
t3
3
01: Verif
y
successful a
n
n
o
tatio
n
of non-co
m
m
its
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Bu
i
ltin-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Re
f
actor notes concaten
a
tion into a flexi
b
le i
n
terf
a
ce
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Note
s
AP
I
:
Allow multiple concur
r
e
nt notes t
r
ee
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es API: w
r
ite_
n
ot
e
s_tree():
S
t
ore the no
t
e
s
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Note
s
API: fo
r
_e
a
ch
_
no
t
e(): Traverse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Notes API: get
_
note
(
)
:
R
eturn the no
t
e annotating t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
remov
e
_note(): Remove
n
o
t
e obje
c
ts fr
o
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
Notes
AP
I
:
a
dd
_
note(): Add note objects to the inte
r
nal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next