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
RelNotes/1.8.5: direct script writers to "git status --porcelain"
2013-09-24
Johan
Herla
n
d
sample pre-commi
t
h
ook: use
--bool
when retrie
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Her
l
and
t320
0
: Add te
s
t
demonstr
a
t
i
ng minor
regres
s
ion
i
n 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Refer
to branch
.
<name>
.
r
e
mote/merge when d
o
cumenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Herland
t3200: Minor fix when prep
a
ri
n
g for trackin
g
failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
nd
t
2024:
Fix
&
&-chaining and a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move
c
reate_notes
_
co
m
mit() from notes-merge
.
c
i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
a
n
Herland
Move c
o
p
y
_note_for_rewrite + friend
s
from buil
t
in/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_copy_no
t
e
s_for_re
w
rite(): Let calle
r
pr
o
vide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
gl
o
ssary: Update
and reph
r
ase the
d
ef
i
nition of a
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n He
r
l
a
n
d
branch
.
c: Validat
e
tracking branches wi
t
h refs
p
ecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
h
a
n Herland
t9114
.
2:
D
on't us
e
-
-track
option against "svn-re
m
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
ha
n
Her
l
and
t7201
.
24: Add refspec to keep -
-
track work
i
ng
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t3200
.
39: tracking setup should fa
i
l if
t
here is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
checkout: Use r
e
mote refspecs when
DWIM
m
ing
t
racking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t2024: Show f
a
i
lure
t
o use refspec when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t
20
2
4
: Ad
d
t
ests verifying current
DWIM behavi
o
r
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an
H
erland
git symbolic-ref --delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
F
ix failure
to delete
a
p
acked ref thro
u
gh a sym
r
ef
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an Herland
t1400-update-
r
e
f
:
Add test verifyi
n
g b
u
g wit
h
sy
m
refs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
erland
n
o
t
e
s-merge: Don't remove
.
git/NOTES_MERGE_W
O
RKTR
E
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
He
r
land
notes-me
r
ge: use opend
i
r/
r
e
ad
d
ir in
s
t
e
ad of
u
si
n
g r
e
ad_
d
irec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310: illust
r
ate failure
t
o "notes merge
-
-commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
an
d
fast-import: Fi
x
incor
r
ect fano
u
t
l
evel when
m
o
d
ifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9
3
0
1: Add 2nd testcase exposing bugs in f
a
st-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t
9
301: F
i
x testcas
e
c
overi
n
g
u
p a bu
g
in f
a
st-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Herland
t5400: Fix
a c
o
uple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dir
s
tat error
m
e
s
sages fo
r
t
ranslation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve erro
r
handling when parsi
n
g dirst
a
t p
a
rameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New -
-
dirstat=lines
mod
e
,
do
i
ng dirst
a
t
a
naly
s
is based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specifying --dirstat
c
ut-off
p
e
r
c
enta
g
e as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n Herland
Add confi
g
variable for specifying default
--d
i
rsta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
r
la
n
d
Refactor --dirstat parsi
n
g;
dep
r
e
cate --c
u
mul
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
M
a
ke --dirs
t
at=0 ou
t
put directo
r
ie
s
t
hat contribut
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
A
d
d
s
everal test
c
a
ses fo
r
--dirstat and fr
i
ends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han
H
erland
-
-dirstat: In case of r
e
n
a
mes, use tar
g
e
t
filena
m
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
Te
a
ch --dirstat not
t
o complete
l
y
ignore rearr
a
nged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
--dirstat-
b
y-
f
i
l
e
: M
a
ke it fa
s
te
r
and mo
r
e correc
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--dirstat: D
e
scr
i
be non-obviou
s
differences
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
ha
n
Herla
n
d
Make "git
notes add" mor
e
user-frie
n
dly when
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
Herland
log/pretty-options: Doc
u
ment --[no-
]
no
t
es and deprec
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han H
e
rland
branch/che
c
kout --trac
k
: Ensure that
u
p
stream
b
ran
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n
Herland
p
u
sh
.
default: Rename 'tracking' to
'
upstr
e
a
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Provide 'git merge --abort'
a
s a
s
ynonym to 'git
r
e
se
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
cmd_merge(): Par
s
e options b
e
fo
r
e checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Provide 'git
note
s
g
e
t-re
f
' to easily retrieve c
u
rrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git
n
ote
s
mer
g
e:
A
dd
t
estcase
s
f
or merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herland
git notes merge: Add another
auto-
r
e
s
olving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes m
e
r
g
e
:
--commit should fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
He
r
land
git
n
ot
e
s merg
e
: List conflicting no
t
es in not
e
s
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es merge: Ma
n
ual conflict
r
esolution,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
er
l
and
git notes merg
e
: Manu
a
l conflict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Document
a
t
ion: Preliminary
d
o
c
s on 'git
notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
o
tes merge:
Ad
d
automa
t
ic conflict reso
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git not
e
s
m
e
rge:
H
a
n
dle real, non-conflict
i
ng not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Her
l
and
b
uiltin/notes
.
c
:
Refacto
r
creati
o
n
o
f
n
otes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge
:
Initial implementation hand
l
ing tr
i
vial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
builtin/notes
.
c: S
p
lit n
o
tes ref DWIMmery
in
t
o a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
lan
d
notes
.
c: Us
e
t
w
o n
e
w
lines (instead of on
e
) w
h
en conca
t
enatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n He
r
l
an
d
(
t
rivial
)
t3303:
I
nd
e
nt wi
t
h
tabs inst
e
ad o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
notes
.
h/c: Propagate combine_notes_fn
r
etu
r
n value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rla
n
d
notes
.
h/c: Allow combine_notes functions to remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herla
n
d
notes
.
c: Reorder
f
unctions in prepa
r
ation
for n
e
xt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make de
f
ault_notes_ref() avai
l
a
ble in n
o
tes AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
(t
r
ivial) not
e
s
.
h: Mino
r
do
c
u
mentation fixes to
c
opy_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
n
ot
e
s
.
c
: Hexify SHA1 in die(
)
mess
a
g
e
f
rom i
n
it_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
Herland
n
o
tes:
D
on't
create (
e
mpty) com
m
it w
h
en r
e
moving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enab
l
e custom
s
chemes for column c
o
lors in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
ohan
H
erlan
d
Make graph
_
n
ext_line() available in
t
he graph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
revision: Turn off his
t
ory simpli
f
ica
t
ion in
-
-ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
oh
a
n Herla
n
d
revision
:
Fix typ
o
in -
-
ancestry-path error messag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Her
l
and
D
o
cumentation/r
e
v
-list-
o
ptions
.
txt: Explain --
a
ncestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
ocumenta
t
i
o
n
/
rev-list-opt
i
ons
.
txt: Fi
x
missing
l
ine
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
ha
n
H
e
r
land
di
f
f
.
c
:
Ensur
e
"i
n
dex $from
.
.
$to" line contains unam
b
igu
o
us
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han
Herland
built
i
n-notes: Minor (mos
t
ly p
a
rse
_
o
pti
o
ns-relate
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submo
d
u
le
summary: D
o
n't barf when invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
il
t
in-
n
otes: Add "copy" s
u
bco
m
mand for copying not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
H
erl
a
nd
bu
i
l
t
in-notes: Misc
.
refactoring
o
f argc
a
nd
exit val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes:
Add -c/-C op
t
ions for r
e
using
n
o
t
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
bu
i
ltin-notes: R
e
facto
r
handling o
f
-F option to al
l
ow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes:
Deprecate the -m/-F
option
s
for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
bu
i
l
t
in-notes: Add "
a
ppend" subcom
m
and for ap
p
endi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
builtin
-
n
otes:
A
dd
"
add" sub
c
om
m
a
n
d
for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
builtin-notes: Add
--m
e
ssa
g
e
/--file alia
s
es for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
builtin-not
e
s:
A
dd
"list
"
s
u
bcomm
a
nd for listi
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
Documentation:
G
eneraliz
e
gi
t
-notes
d
ocs
to 'obj
e
cts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-not
e
s: Add "prune" subcommand f
o
r removin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
N
o
t
es
A
PI
:
prune_notes(): Prun
e
notes
t
hat belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
and
t
3305: Verify that removi
n
g
notes triggers automati
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
u
iltin-
n
otes: A
d
d "
r
emove" subcomman
d
for re
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Teach builtin-notes to remo
v
e empt
y
note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
Teach notes code to properly preserv
e
non
-
n
ot
e
s in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
t3305: Veri
f
y that addin
g
many notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301
:
Verify success
f
ul ann
o
t
a
t
i
on of
n
on-commit
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builti
n
-ify
g
i
t
-note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
n
d
R
e
f
a
c
t
o
r notes co
n
catenation into a flexib
l
e interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
AP
I
: A
l
low
multiple concurrent notes
t
rees wi
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes API
:
write_notes_tree():
St
o
re the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
Notes
API: for_each_note():
Tra
v
erse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes API: get_not
e
(): Return the note
annotating
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes AP
I
: remove
_
no
t
e(): Remove
note ob
j
ects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next