repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
notes: empty notes should be shown by 'git log'
2014-11-12
Johan Herland
notes: empty notes
shou
l
d b
e
shown by
'git log
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-12
Johan
H
erland
bu
i
l
t
in/notes: add --a
l
low-empty, to
a
llow storing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-12
J
o
han Herland
builtin/notes
:
split
create
_
n
ote() to
c
larify add
vs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-12
J
o
han Herla
n
d
bu
i
ltin/notes: simplify
early e
x
it code in add()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
Joha
n
Her
l
and
builtin/notes: re
f
actor note file p
a
th into struct
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
J
o
han Herl
a
nd
builtin/
n
otes: improve
n
a
m
i
ng
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herla
n
d
t3301: verify that 'gi
t
no
t
es
'
r
emoves
empty not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
Johan He
r
lan
d
builtin/note
s
: fix premature fai
l
ure when tryin
g
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-04-19
Johan Herlan
d
Git 2
.
0
:
git svn: Set defaul
t
--prefix='orig
i
n/' if
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-02-20
Joha
n
Herland
notes
:
disallow
r
eusing n
o
n-blob as a note object
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-28
Johan Her
l
an
d
sha1_file
.
c:create_tmpfil
e
(): Fi
x
race w
h
en crea
t
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan
H
e
r
l
and
git-svn:
Warn abo
u
t ch
a
nging defau
l
t for --pre
f
i
x
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Jo
h
an Herland
Documentatio
n
/git-svn
:
Promote the use of --pr
e
f
i
x
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-24
Johan
Her
l
a
n
d
s
ample pre-co
m
m
i
t
hook: use -
-
b
o
ol when r
e
tr
i
ev
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t3200
:
Add
t
est dem
o
nstrating minor r
e
gress
i
on in 41c21f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
ohan Herlan
d
R
e
fer to
branch
.
<na
m
e
>
.
r
e
mote/merge
w
he
n
documenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herlan
d
t3200: Mi
n
or fix when prepa
r
ing for tr
a
cking f
a
ilure
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Her
l
a
n
d
t2024: Fix &&-chainin
g
and
a
cou
p
le of
t
ypos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
M
o
ve c
r
eat
e
_notes_commit() from n
o
te
s
-merge
.
c
i
nto
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
Herland
Move co
p
y
_not
e
_f
o
r_rewrite + f
r
iends fr
o
m b
u
il
t
in/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
fin
i
sh_copy
_
note
s
_for_rewrite(): Let ca
l
ler provid
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glossary: U
p
d
ate and
r
ephrase the definition
o
f a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: V
a
lidate
tracking branc
h
e
s with r
e
f
s
pecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t9114
.
2: Don
'
t
use --track
o
pt
i
on aga
i
nst "
s
vn-
r
emote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t7201
.
24: Add refspec to k
e
ep -
-
trac
k
w
o
r
k
i
ng
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herlan
d
t
3
200
.
39: tracking setup should fa
i
l if there is
no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Use
r
emote refspec
s
wh
e
n D
W
IMmin
g
trackin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
n
d
t2024: S
h
o
w f
a
i
l
ure to use refspec
w
hen DWIM
m
ing remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
e
rl
a
nd
t
2
02
4
: Add tests veri
f
ying current
D
WIM b
e
havior
o
f
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Her
l
and
g
it symbolic-ref --delet
e
$
s
ymref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
lan
d
F
ix f
a
ilure to
d
elete a packed ref throu
g
h
a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rland
t1400-update-ref: Add test verifying
bug with sym
r
ef
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herl
a
n
d
n
o
t
es-merge
:
Don't
r
e
move
.
git/NOTE
S
_MERGE_WORKTR
E
E
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an Herland
n
o
tes-me
r
ge: us
e
op
e
ndir/
r
eaddir inst
e
a
d
of using read_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
r
l
a
nd
t
3310: i
l
lustrate failure to "not
e
s merge --com
m
it
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
fast-im
p
o
rt: Fix incorr
e
ct f
a
nout lev
e
l when mod
i
fying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan He
r
land
t
9
30
1
: Add 2n
d
t
e
s
t
c
ase exposing bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t
9
301: Fix
testcase covering up a bug in fast-i
m
port
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
Herland
t
5400: Fix
a
c
ouple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n Herland
Mark dirs
t
at
error messages
for translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve err
o
r ha
n
dl
i
ng when pa
r
sing dir
s
tat
p
arameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dir
s
tat
=
l
ines mod
e
, doi
n
g dir
s
tat an
a
lysis
based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Allow
spe
c
ifying --dirst
a
t cut-of
f
percentage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config variable for spec
i
fyin
g
defaul
t
--di
r
stat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor --dirstat parsing;
dep
r
e
ca
t
e --cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Make --dirs
t
at=0 output directori
e
s that cont
r
i
bute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several
t
estcases for --
d
i
r
stat
a
n
d friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
an
Herland
--dirstat: In ca
s
e of renames, u
s
e target filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
Teach --dirst
a
t not to c
o
mpletely ignore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
irstat-by-file: Mak
e
it
faster and more corre
c
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--d
i
rstat: Desc
r
ibe no
n
-obvious differences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git notes ad
d
" mor
e
user-
f
riendly wh
e
n there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pre
t
t
y
-options: Document --[no-]notes and
depr
e
cate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checkout --t
r
ack: Ensure
that upstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default: Re
n
ame 'trackin
g
' to '
u
p
stream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herla
n
d
Prov
i
de
'
g
i
t merge -
-
abort' as a syno
n
ym to 'git re
s
et
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_me
r
g
e
():
Parse options b
e
f
ore ch
e
cking
M
ERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
P
rovide 'gi
t
notes get-ref' to
easily retrieve
current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merg
e
: Add testcases for merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merge: Add another auto
-
resolving strat
e
gy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
g
i
t
notes m
e
rge: --commit should fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
g
it notes merge:
L
i
s
t confl
i
cting no
t
es in not
e
s me
r
g
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
r
l
a
nd
g
it notes merge: M
a
nual conflict r
e
solution, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git no
t
e
s merge: M
a
nual conflict resolu
t
ion, pa
r
t 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Documentation: Preliminary docs
on 'git not
e
s merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge: Add a
u
t
o
ma
t
ic conflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git note
s
merge: Handl
e
real, non
-
conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
builtin/notes
.
c: Refactor creation of notes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
merge: Initial
i
mplementat
i
on
h
andli
n
g
t
rivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
buil
t
in/n
o
t
es
.
c:
S
plit no
t
es
ref DWIMmery into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n Herland
notes
.
c:
U
se
t
w
o
n
ewlin
e
s
(
instead o
f
o
ne)
w
h
en concat
e
natin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3
3
03: Indent
with
t
ab
s
inst
e
ad of s
p
aces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
notes
.
h/c
:
Prop
a
gate c
o
mbin
e
_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
no
t
es
.
h/c
:
Allow combine_no
t
es
f
unctions to remo
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan H
e
rland
not
e
s
.
c
:
Reorde
r
f
u
nctions in p
r
eparation for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h
:
Make
defau
l
t_notes_re
f
(
)
available
in no
t
es API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
(trivial) n
o
te
s
.
h: Min
o
r documentation fixes t
o
copy_note
s
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c: Hexify SHA1 in d
i
e() message
from
init_n
o
t
e
s(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
J
o
h
an
H
e
rland
notes:
Don't create (empty) commit
w
hen removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custom
s
chemes f
o
r colum
n
col
o
rs in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n H
e
rl
a
n
d
Make graph_next_line
(
)
a
v
a
ilable in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
e
vision: Turn off history sim
p
lification i
n
--ances
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
evision: Fix typo in -
-
ances
t
r
y
-path error mes
s
a
ge
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herl
a
nd
D
o
cumentation/
r
e
v
-list-options
.
txt
:
E
x
p
l
ain --ances
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docu
m
ent
a
tion/re
v
-li
s
t
-opt
i
ons
.
txt: F
i
x mis
s
ing
li
n
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensu
r
e "in
d
ex $from
.
.
$to"
line con
t
ains un
a
m
b
iguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
built
i
n-notes: Minor (mostly parse_options-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Her
l
an
d
sub
m
odule summary
:
Don't barf when invoked in
an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add
"
c
opy" subco
m
mand for copying no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
l
t
i
n
-notes: Misc
.
refactoring
of arg
c
and
exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes: Add -c/-C options for r
e
using notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-no
t
es: Refactor han
d
ling of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
H
erland
builtin-n
o
tes: Deprecate t
h
e -m/-F o
p
tions for
"gi
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d "append
"
subco
m
m
and for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
b
uilti
n
-n
o
tes: A
d
d "
a
d
d" subcommand for
adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: Add --message/--
f
ile aliases for
-
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-not
e
s: Add "li
s
t"
sub
c
ommand
f
o
r list
i
ng n
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
Documentation:
Generalize git-notes
d
ocs t
o
'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n He
r
land
builti
n
-n
o
tes: Add "prune" subcommand for rem
o
ving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes
A
PI: prune
_
no
t
es():
P
r
un
e
notes that belong
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next