repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
notes: disallow reusing non-blob as a note object
2014-02-20
Joh
a
n
H
e
r
lan
d
no
t
es: disallow reusi
n
g
non-blob as a note object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t320
0
: Add test demons
t
r
ating mi
n
or regression
in
4
1
c
21
f
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n H
e
rland
R
e
fer to branch
.
<name>
.
remote/m
e
rge when documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Herland
t3200:
M
inor f
i
x wh
e
n preparing for trac
k
ing
failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
a
n Herland
t2024: Fix
&
&
-chaining and a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move
cr
e
ate_notes_commi
t
() fr
o
m notes-
m
erge
.
c i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herl
a
nd
Move copy_
n
ote_f
o
r_rewr
i
t
e
+ friend
s
from bu
i
ltin/no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Her
l
and
f
inish_copy_notes_for_
r
ewrite():
Let caller pro
v
i
d
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glossa
r
y:
U
pdate
and
rephrase the def
i
niti
o
n
o
f a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branc
h
.
c: Vali
d
ate trackin
g
branches wit
h
refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2: Do
n
'
t
use --track option against "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herla
n
d
t7201
.
24: Add refspec to kee
p
--track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herla
n
d
t3200
.
39: tracking setu
p
s
h
o
uld fail if t
h
ere
is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
ch
e
ckout: Use remote re
f
specs whe
n
D
W
IM
m
ing trac
k
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t2
0
2
4
: Show f
a
i
lure to use
r
efspec w
h
e
n
D
W
IMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
t2024:
A
dd
t
ests
v
erif
y
ing c
u
r
ren
t
DWIM behavi
o
r of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symb
o
lic-ref --dele
t
e $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rland
Fix failur
e
to dele
t
e a packed ref through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Her
l
and
t140
0
-
updat
e
-
ref
:
Add
test verify
i
n
g bug w
i
th symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n
H
erland
no
t
es-merge
:
Don't rem
o
ve
.
gi
t
/NOTES
_
M
E
RGE_W
O
R
K
T
REE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
erland
n
o
tes-
m
erge: use
opend
i
r/re
a
ddir instead of us
i
ng r
e
ad_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
t3310: i
l
l
ustrate
failure t
o
"n
o
tes
m
erge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
fast-import: Fix incor
r
ect f
a
nout level when modifyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: A
d
d 2n
d
te
s
tcase e
x
posing bug
s
in fast-
i
mpor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix t
e
stc
a
se
c
overing
u
p
a
bu
g
in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rl
a
nd
t5400: Fix a couple of
t
y
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Mar
k
d
i
rstat erro
r
messages for translatio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Improve error handling when parsing
dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
la
n
d
New --dirstat=lines mode
,
doing dirstat analysis
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rlan
d
Allow specifying --di
r
stat cut-off perc
e
ntag
e
as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n
Herl
a
nd
Add conf
i
g
variable f
o
r s
p
ecif
y
ing default -
-
d
irstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Her
l
and
Refac
t
or --di
r
stat par
s
in
g
; de
p
rec
a
te --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Make --dirstat=0 ou
t
pu
t
directories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several
t
es
t
cases fo
r
--dirstat and friend
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herlan
d
--dirstat: In case of re
n
a
m
es, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herla
n
d
Teach --dirstat not to c
o
m
p
let
e
ly ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
dir
s
tat-by-file: Make it faster
and more
c
orre
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han He
r
l
a
nd
--dirsta
t
: Desc
r
ibe non-o
b
vious differences
r
e
lative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
e
rland
Make "git n
o
tes a
d
d" mo
r
e user
-
fri
e
ndly w
h
en t
h
ere
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
erland
l
o
g/pretty-options: Document --[no-]notes and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
ohan Herland
branch/checkout --tra
c
k:
Ensure tha
t
upstream bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Joha
n
Herl
a
nd
push
.
d
e
f
ault: Re
n
ame 'tracking' to 'up
s
t
r
eam'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
and
Provi
d
e 'git merg
e
--a
b
or
t
' as
a synonym
t
o 'git
reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
cmd_m
e
rge():
P
a
r
s
e
opti
o
ns bef
o
re ch
e
cking
MERGE_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Pr
o
v
ide 'git notes get-r
e
f
' to easily retrieve
c
u
rrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge: Add testcases fo
r
merging notes
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
land
git notes
m
erge
:
Ad
d
anot
h
er
a
uto-resol
v
ing strateg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
--co
m
mit should fail if underl
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
git
notes merge: List conf
l
icting
notes in no
t
e
s merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes merge:
M
anual
c
o
n
f
lict r
e
solu
t
ion
,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
git notes merg
e
:
Manual confl
i
c
t
resol
u
tio
n
, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docum
e
n
t
a
ti
o
n: Preli
m
inary d
o
cs o
n
'git notes me
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git not
e
s mer
g
e: Ad
d
autom
a
tic
conflict
r
esolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
merge: Handle real, non-c
o
nflicti
n
g
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
builtin/notes
.
c
: Refacto
r
creation
o
f not
e
s
co
m
mi
t
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes m
e
rge:
Initial
i
mplementation handling
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
bui
l
tin/notes
.
c: Split notes ref DWIMmery
i
n
t
o
a se
p
ar
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
t
es
.
c: Use two ne
w
l
i
ne
s
(ins
t
ead of one) when c
o
nc
a
tenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial)
t
3
3
0
3
: Inden
t
wi
t
h tabs instead
of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
nd
no
t
es
.
h/c: Propag
a
te combine_n
o
tes_fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Her
l
a
n
d
notes
.
h/c: Allow comb
i
ne_not
e
s fu
n
ctions
to rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
c:
Re
o
r
d
er func
t
ions in
p
reparat
i
o
n
f
or
n
ext
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
n
otes
.
h: Make default_notes_ref(
)
available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
(trivial) notes
.
h:
M
in
o
r documentation fixes to co
p
y_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Her
l
and
n
o
tes
.
c: Hexify SHA1 in
d
ie()
messa
g
e from ini
t
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n Her
l
a
nd
notes: Don't create (empty) comm
i
t when r
e
mov
i
ng non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
oh
a
n H
e
rland
Ena
b
le custom schemes for column colors i
n
the graph AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
M
a
ke graph_next_
l
ine
(
) avai
l
ab
l
e
in th
e
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
r
e
v
ision: Turn off histo
r
y simplification in
--ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
revisi
o
n: Fix typo in --ance
s
try-path er
r
or mess
a
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Her
l
and
D
o
c
umen
t
a
tion/rev-
l
ist-o
p
t
ions
.
tx
t
: Explain
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
Docum
e
ntation/
r
ev-
l
ist-op
t
ions
.
txt: F
i
x mis
s
i
ng
l
ine
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herlan
d
diff
.
c: E
n
sure "index $from
.
.
$
to" li
n
e contains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
H
erland
b
u
iltin-notes: Minor (mostly
parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an Herland
submodule summary:
Don't
b
arf
w
hen
invoke
d
in an
e
mpty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes:
Add "copy" subcommand for copying
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
b
uiltin-notes: M
i
s
c
.
r
efa
c
toring of
a
r
g
c and
e
xit
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bui
l
tin-notes
:
Add -c/-C
o
ption
s
f
or reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
il
t
i
n-notes
:
Refactor handling o
f
-F option to all
o
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: De
p
r
e
cate the
-
m/-F options for
"
git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
b
u
iltin-notes:
Add "append" s
u
bco
m
mand f
o
r appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: Add "add
"
subc
o
mma
n
d for adding
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
builtin-not
e
s
:
A
d
d --mess
a
g
e
/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
built
i
n
-notes: Add "list" subcommand f
o
r listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Documen
t
ation: G
e
nera
l
ize git-not
e
s docs to 'ob
j
ects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes: Add "prun
e
" subcomma
n
d
f
or removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes AP
I
:
prune_
n
otes(): Prune note
s
that bel
o
n
g to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify
that removing notes trigg
e
rs
autom
a
tic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
il
t
i
n-no
t
es:
A
dd "remove" subcommand for re
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Teach built
i
n
-notes
to re
m
ove empt
y
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Teach notes code
to pr
o
perly preserve non-
n
otes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
t3305: Verify tha
t
adding man
y
notes wit
h
g
i
t-note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t33
0
1: Ve
r
ify
s
uccessful annotation o
f
non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
B
u
ilti
n
-
i
fy git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
Refac
t
or notes co
n
cat
e
nation into a flexi
b
le interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herlan
d
Notes API: Allow mul
t
ip
l
e conc
u
r
rent notes t
r
ees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
N
o
tes API: write_notes_tree(): St
o
r
e
t
he note
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
Notes
A
PI: fo
r
_each_note(): Traverse t
h
e entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
e
rl
a
nd
N
otes API:
g
et_n
o
te()
:
Re
t
urn the
note annotatin
g
t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
N
otes API
:
remov
e
_note():
R
emove note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next