repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-svn: Warn about changing default for --prefix in Git v2.0
2013-10-12
J
o
han
Herland
git-s
v
n: Warn about c
h
anging default
for
-
-
pref
i
x in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan He
r
land
D
ocume
n
tatio
n
/git
-
svn: Prom
o
te
t
h
e
use of --prefix
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200
:
Add
te
s
t de
m
onstrat
i
n
g
minor regressio
n
i
n
41
c
21
f
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
n
d
Refer to
b
ran
c
h
.
<name>
.
remo
t
e/merge when documenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t
3
2
00: Minor fix when preparing f
o
r t
r
acki
n
g
failu
r
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
land
t2024
:
F
ix &&-chaining a
n
d a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
M
o
v
e creat
e
_notes_commit() from notes-m
e
rge
.
c into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herla
n
d
M
o
ve
c
opy_note_for_rewrite + friends from bui
l
tin/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
finish
_
copy_notes_for_
r
e
wri
t
e(): Let ca
l
ler provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herlan
d
glossary
:
Update an
d
rephrase the definition of a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
b
ran
c
h
.
c: V
a
lid
a
te
t
racking bra
n
ch
e
s with refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t9
1
14
.
2: Don't use --track opti
o
n again
s
t
"
svn-remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t7201
.
24: A
d
d
refsp
e
c to keep --track working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t3200
.
39: tracking set
u
p should
f
a
i
l if th
e
re is
n
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Use re
m
o
t
e refspecs
w
hen
D
WIMming track
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Show f
a
ilure to use
r
e
f
sp
e
c when
DWIMmi
n
g re
m
ote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024:
Add tes
t
s
v
e
r
ifying curren
t
DWIM behavi
o
r
of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
git symbo
l
i
c-ref --delete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
F
i
x fail
u
r
e
t
o delete a pac
k
e
d ref through
a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-update-ref: Add test
verifying
bug w
i
th symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n H
e
rland
notes-merge: Don't remove
.
git/NOTES_ME
R
GE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Herland
n
otes-merge: use opendir/readd
i
r i
n
stea
d
o
f
u
s
ing read_dir
e
c
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Her
l
and
t3310: illustrate
f
a
ilu
r
e
to "no
t
es merge
--commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
fast-impo
r
t:
F
ix incorrect fan
o
ut level
when modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
t9301: Add 2nd testcase exposing bugs in
f
ast
-
im
p
ort
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n
H
erland
t9301: Fix testcase coveri
n
g up a b
u
g
in fast-impo
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Her
l
a
n
d
t5400: Fix
a
cou
p
le of
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark d
i
rstat
e
rro
r
messages for transl
a
t
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herla
n
d
Improve error handli
n
g
w
hen parsing dirsta
t
param
e
ters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
New --dirst
a
t=line
s
mode, doing dir
s
tat an
a
l
y
s
is based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
erl
a
nd
Allow specifying
-
-dirstat
c
ut-
o
f
f
percentage
a
s a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n H
e
rland
Add con
f
ig var
i
a
b
l
e
fo
r
spec
i
f
y
ing d
e
fault -
-
dirsta
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Refactor --d
i
rs
t
at
p
arsing;
d
eprecate --cumulat
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ma
k
e --d
i
rstat=0 out
p
ut directories t
h
at contr
i
bute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add seve
r
al testcas
e
s for --dirst
a
t an
d
friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: I
n
case of
r
enames, use target filena
m
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n
H
erla
n
d
Teach --di
r
stat not to complet
e
ly ig
n
ore
rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
lan
d
--dirstat-by
-
file
:
Make it
fast
e
r and more cor
r
ect
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe non-obvi
o
us diffe
r
e
nc
e
s rel
a
tive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Ma
k
e "git notes
add" more user-fri
e
ndly when
there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
log
/
p
re
t
t
y
-options: Documen
t
--[no
-
]notes and dep
r
e
c
ate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
a
n Herl
a
nd
br
a
n
ch/check
o
ut --track: Ensure that upstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan H
e
rla
n
d
push
.
de
f
ault: Rename 'tracking
'
to
'
upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provid
e
'
g
i
t merge --ab
o
rt'
as a s
y
n
o
nym
to
'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
c
m
d_merge():
P
arse options befo
r
e
checki
n
g MERG
E
_H
E
AD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Prov
i
de
'
git notes
g
e
t-re
f
'
t
o e
a
sily
retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: A
d
d testcases for merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
He
r
land
git notes merge: Ad
d
another
auto-resolving
strate
g
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
land
git
n
otes
m
erge: --commit should
fail if
underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes
m
erge:
List conf
l
icting notes in
n
ote
s
merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
l
a
n
d
gi
t
not
e
s merge:
Manual conflict r
e
solution, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
nd
git notes mer
g
e: Manual conflict resolution,
p
a
r
t 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation: Pre
l
imi
n
ary doc
s
o
n
'git no
t
e
s m
e
rge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
g
it notes mer
g
e: Add
a
utomatic
conflict
resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
g
i
t
notes merge:
H
andle real, non-confli
c
ti
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/not
e
s
.
c: Refactor cre
a
tion of not
e
s
commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
g
it
no
t
es merge
:
I
n
itial
i
m
plementation handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
built
i
n
/
no
t
e
s
.
c: S
p
li
t
notes ref DW
I
Mm
e
ry into a separat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
notes
.
c: Use two newlines (in
s
tead
o
f on
e
)
when con
c
aten
a
tin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rla
n
d
(
trivial) t3303:
Indent wi
t
h tabs instead of spa
c
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
notes
.
h/c: Propagate combine_no
t
e
s_fn re
t
u
r
n v
a
lue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n Herla
n
d
n
o
tes
.
h/c: Allow combine_notes f
u
nc
t
ions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
c:
Re
o
rde
r
fu
n
ct
i
ons in preparation for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
h:
M
a
ke defau
l
t_notes_ref(
)
available in notes
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
tr
i
vi
a
l) notes
.
h: Minor
documentation fixes to c
o
py_not
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c: Hexify S
H
A1
i
n die() mess
a
g
e from
i
ni
t
_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
J
o
han Herland
notes: Don't crea
t
e (empty) commit when removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custom s
c
heme
s
f
o
r column
c
olo
r
s in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Ma
k
e graph_next_lin
e
()
a
v
ailable i
n
the
g
rap
h
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
e
r
land
r
evision
:
Turn
off history
s
implification
i
n --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
r
evisio
n
:
Fix typo in --ancestry-path error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herl
a
n
d
Documentat
i
on/rev-list-options
.
txt: Ex
p
lain --ance
s
try
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
Documentation/rev-list-options
.
txt: Fix missing li
n
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
d
i
ff
.
c: Ensu
r
e "
i
ndex $fr
o
m
.
.
$to" lin
e
contains unam
b
iguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herlan
d
builtin-notes:
Minor (mos
t
l
y
parse_optio
n
s-rel
a
t
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule
s
umm
a
ry: 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 Herlan
d
bui
l
t
i
n-notes: Add "copy"
s
u
bcommand for copy
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
bu
i
ltin-notes:
Misc
.
r
e
fact
o
ring of argc
a
n
d
exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin
-
n
ote
s
: Add -c/-C opti
o
n
s for reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
H
erland
bui
l
tin-notes: Re
f
a
c
tor handling of -
F
op
t
ion to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
t
es: Deprecate the
-
m
/
-
F options
f
or "g
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
built
i
n-no
t
es: Add "append" subcomman
d
f
or a
p
pend
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes
:
Add
"
a
d
d"
subcommand for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd --message/--file
a
liases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
bu
i
ltin-notes
:
Ad
d
"list" subcomman
d
f
o
r li
s
ting note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
Document
a
tion: Ge
n
e
r
alize git-notes docs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
b
uil
t
in
-
notes: Add "prune" subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI: prun
e
_notes(): Prune not
e
s that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t
3
305: Verify
tha
t
r
em
o
vi
n
g
notes
t
riggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
buil
t
in-note
s
: Add "
r
emove
"
subcom
m
and for r
e
moving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
T
e
ach bu
i
ltin-
n
o
t
es to r
e
m
ove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
e
ach notes code to properl
y
prese
r
ve n
o
n-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t
3305:
Verify th
a
t ad
d
ing many notes
w
i
th git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
01: Verify successful
annot
a
t
i
o
n
o
f non
-
co
m
mits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Buil
t
in-ify git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
Refact
o
r notes concat
e
nat
i
o
n i
n
to
a flex
i
ble i
n
t
e
rface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes A
P
I: Al
l
ow
m
u
l
tiple con
c
urrent notes
tr
e
e
s wi
t
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
Note
s
API: w
r
ite_note
s
_tre
e
(
): Store
t
he notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
API: for_each
_
no
t
e(): Trave
r
s
e
the
entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes
A
PI
:
get_note(): Re
t
u
r
n
th
e
note
annot
a
t
i
ng th
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next