repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin/notes: improve naming
2014-11-10
Jo
h
an Herlan
d
built
i
n/notes: i
m
prove n
a
m
i
ng
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Joha
n
Herland
t
3
3
0
1
: veri
f
y th
a
t
'git notes' removes em
p
ty
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Jo
h
an Herland
builtin
/
notes: fix premature failure when trying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Jo
h
an Herland
Git 2
.
0: git svn:
S
et default --pre
f
ix='origin/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
J
ohan Herland
notes: disa
l
low
r
eusing n
o
n-b
l
ob a
s
a not
e
object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Jo
h
a
n Herlan
d
sha1_file
.
c
:cr
e
ate_t
m
pfile(
)
: Fix race whe
n
c
r
e
a
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
git-svn: Warn about c
h
anging d
e
fault for --prefix
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herla
n
d
Documentation/git-svn: Pr
o
mot
e
the use o
f
--prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan He
r
land
sample pre-com
m
i
t
ho
o
k:
use --bo
o
l when retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n H
e
rla
n
d
t3200: Add te
s
t demonst
r
at
i
ng minor regression in 41c
2
1f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Herland
Refer
t
o branch
.
<name>
.
r
e
mot
e
/merge
when doc
u
menting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rland
t3200: M
i
nor
fix wh
e
n preparing for
trackin
g
failu
r
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an
Herlan
d
t2024:
Fix &&-chain
i
ng and a couple
o
f typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
ohan He
r
land
Mo
v
e c
r
eate_notes_com
m
it() from not
e
s-merge
.
c
i
nto
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Her
l
and
Move copy_note_fo
r
_rew
r
ite + fri
e
n
d
s
from
b
u
ilti
n
/no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
Herland
f
ini
s
h_copy_note
s
_for_rewrite
(
)
:
L
e
t caller
p
rovide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
glos
s
ary: Update and rep
h
rase the definition of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Validat
e
tracking branches with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herl
a
nd
t
9
114
.
2
: Don't use --trac
k
opti
o
n agains
t
"svn-remot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
a
n
d
t72
0
1
.
24: Add refspec
to
keep --track work
i
ng
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t320
0
.
39: tracking setup should fail if the
r
e is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: U
s
e remo
t
e refspecs when DWIMming tra
c
king
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t20
2
4
:
Show failur
e
to
u
se refspec when DWIM
m
ing remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t2024:
A
d
d tests ver
i
fying curren
t
D
W
IM
b
e
ha
v
ior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan
Herland
git
symbolic-ref --
d
elete $s
y
mref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herlan
d
Fi
x
failur
e
to del
e
te
a
packed r
e
f through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Her
l
and
t1400-update
-
ref: Add test veri
f
ying bug w
i
th sym
r
efs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n Herland
note
s
-merg
e
:
Do
n
't remove
.
g
i
t/N
O
TES_MERG
E
_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
erland
notes-merge:
use opendir/readdi
r
i
n
s
t
ead of using read_
d
ire
c
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
t3310: illustrat
e
f
a
ilure to "notes merge --
c
ommit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
f
ast-import: Fix i
n
corre
c
t fan
o
ut level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t9301: Add 2nd
t
estcase exposing bugs in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Her
l
a
nd
t9
3
01: Fix
t
estcase
c
ov
e
ring up
a
bu
g
in
f
ast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n Herland
t5400: Fix a couple of t
y
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
H
er
l
and
M
ar
k
dirsta
t
er
r
or messag
e
s for t
r
anslati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Improve error handling wh
e
n
p
arsin
g
dirsta
t
p
ar
a
meters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herl
a
nd
New
-
-
dirstat=line
s
mode, do
i
ng dir
s
tat ana
l
ysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
Allow specify
i
ng
-
-dirstat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
A
dd
config variable for
spe
c
ifying default --dirst
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor --dirst
a
t p
a
rsing; deprecate --cumulat
i
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Make --dirstat=0 out
p
ut
d
i
r
e
ctories that
c
o
ntribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herla
n
d
A
dd sever
a
l test
c
as
e
s for --dirstat
a
nd fri
e
nds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
l
a
nd
-
-
d
ir
s
tat: In case of renames,
u
s
e target filen
a
me
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
Teach --dirstat
n
ot to
completely ig
n
ore re
a
rr
a
nge
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
ha
n
H
erland
-
-
dirstat
-
by-file: Mak
e
i
t faster
a
nd more c
o
r
rect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--dirstat: Describe non-obviou
s
d
ifferences re
l
ati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Mak
e
"git notes add
"
mor
e
user-friendly
w
hen t
h
e
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
Herland
l
og/pretty-op
t
ions
:
Document
-
-
[
no-]notes an
d
deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checkout --trac
k
:
Ensure that upstrea
m
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
Herland
push
.
d
e
fault:
Re
n
ame 't
r
acking'
t
o '
u
pstrea
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herla
n
d
Provide
'
git m
e
rge --abort' as a synonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd
_
m
e
rge(): Parse o
p
tion
s
before checkin
g
MERG
E
_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
Provide 'git n
o
tes get-ref' to
e
a
s
ily retrie
v
e current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
o
tes merge: Add testcase
s
for me
r
ging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merg
e
: A
d
d another auto-
r
esolvi
n
g
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
e
r
l
and
git notes merge
:
--commit should
f
ail
if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
lan
d
git note
s
m
e
rge
:
L
i
st conflicting
notes i
n
n
otes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
H
e
r
la
n
d
git n
o
te
s
merge: Manua
l
c
o
nf
l
ict reso
l
ution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
er
l
and
git
n
otes merge: Manual conflict resolution,
pa
r
t 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
Doc
u
ment
a
ti
o
n: Prel
i
minary docs on 'git notes
m
e
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Ad
d
au
t
oma
t
ic conf
l
ict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
git notes merge
:
H
a
ndle
real, no
n
-
confli
c
ting no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
builtin/note
s
.
c: Refa
c
tor
c
reation of notes
commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge: Ini
t
ia
l
implement
a
tion handling triv
i
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
bu
i
ltin/notes
.
c: Split notes ref DWIMmery into a sep
a
rate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
notes
.
c
: Use two
n
ewlines (instead of one) w
h
en concatenat
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
nd
(tr
i
vial) t3303: Indent with ta
b
s
i
nstead of s
p
aces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Prop
a
gate combine_notes_fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
no
t
es
.
h
/
c
: Allow combine_not
e
s functions
t
o
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herla
n
d
notes
.
c:
Reorder functions in preparati
o
n fo
r
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h: Make
def
a
ult
_
notes_r
e
f
(
) available in not
e
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
(t
r
ivial
)
notes
.
h: Minor documentation fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
n
ote
s
.
c:
Hexify SHA1 in
die() m
e
ssage fr
o
m init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan Herland
notes: Don'
t
c
reate (empty) commit when
rem
o
ving
n
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
l
and
Ena
b
le
c
ustom scheme
s
for column color
s
i
n
t
h
e
g
raph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han H
e
rl
a
n
d
Make
g
raph_next_line() available in
th
e
graph
.
h
AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revisio
n
: Tur
n
off history simplification in
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
revisi
o
n:
Fix
t
y
po in --ancestry-path er
r
or message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
a
n Herla
n
d
Documentation/rev-li
s
t-o
p
tions
.
txt: Explain --an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an H
e
rland
Documentatio
n
/rev-li
s
t-o
p
tions
.
txt: Fi
x
missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herlan
d
di
f
f
.
c: Ensur
e
"index $
f
rom
.
.
$to" lin
e
contains
unamb
i
guous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
b
u
i
l
tin-note
s
: Minor (mostly parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n Herland
s
ubmodu
l
e summary: Don't b
a
rf when invok
e
d in
an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
bui
l
tin-notes: Add "copy" subcommand fo
r
copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Misc
.
refacto
r
ing of argc
a
nd exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes
:
Add -c/-C
o
p
t
i
ons for reusing n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
H
erland
bui
l
tin-notes: Re
f
actor
h
a
ndling o
f
-
F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rl
a
nd
bu
i
ltin-notes: De
p
recate the -m
/
-F
o
p
t
ions for "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builti
n
-notes
:
Ad
d
"append" subcommand for
appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
b
uiltin-note
s
:
A
dd "add" subcomm
a
nd for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: A
d
d --mes
s
age/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
builtin-n
o
t
e
s: Add "list" su
b
command for l
i
sting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentation: Generalize git
-
notes docs to 'obje
c
t
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
b
u
ilt
i
n
-
n
otes: Add "prune" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API:
prune_note
s
():
P
run
e
notes that
b
elong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
05: Verify
t
hat removing notes tri
g
gers a
u
tomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herlan
d
b
ui
l
tin-notes:
A
d
d
"
remove" sub
c
omma
n
d for re
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Teach bui
l
t
i
n-n
o
te
s
to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
Teach
not
e
s cod
e
to properly pr
e
se
r
ve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
t3305: Verify
t
hat adding many notes w
i
th git-note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next