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: add --allow-empty, to allow storing empty notes
2014-11-12
J
o
h
a
n Herland
builtin/notes: a
d
d
-
-allow-em
p
ty, to a
l
low storing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan He
r
land
builtin/not
e
s: split create_note() to clarif
y
add vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Her
l
and
buil
t
in/notes
:
simplify early
e
xit code in add()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Her
l
and
b
uiltin/notes: refacto
r
n
o
te f
i
le path in
t
o struc
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan
Herland
buil
t
in/no
t
es:
i
m
p
r
o
ve
nam
i
ng
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Joha
n
Herlan
d
t3301
:
verify that 'git not
e
s' removes empty notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
o
han Herla
n
d
bui
l
tin/notes: fix
p
remat
u
re fa
i
lu
r
e
w
hen trying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Jo
h
a
n
Herla
n
d
Git 2
.
0: git svn: Set default --prefi
x
='origi
n
/'
if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Johan Herl
a
nd
not
e
s: di
s
al
l
ow reus
i
n
g
non-blob a
s
a note object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Johan He
r
land
sha1_file
.
c:create_tm
p
file(
)
: Fix race when cre
a
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan He
r
land
git-svn: War
n
a
b
out chan
g
i
ng defaul
t
for --prefix
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
Documentation/git-
s
vn: Promote the use of --
p
refix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Joha
n
Herlan
d
samp
l
e pr
e
-co
m
mit hook: use -
-
bool when
retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200: Ad
d
test demonstr
a
ting minor regressi
o
n i
n
41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Refer
t
o branch
.
<nam
e
>
.
rem
o
te/merge when docum
e
nting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t
3
200: Minor fix when preparing
f
o
r tracking fa
i
lure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024: Fix &
&
-chaining an
d
a couple of
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move create_notes_commit() fr
o
m notes-merge
.
c
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herlan
d
Move copy_no
t
e_for_re
w
ri
t
e + friend
s
from builtin
/
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
f
inish_copy_notes_for_r
e
write():
L
et call
e
r provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
g
lossary:
U
pdate
a
nd r
e
p
h
r
a
se
t
he
d
efini
t
ion of a rem
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Val
i
date tracking
branches with ref
s
pecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t9114
.
2
:
Don
'
t use
-
-track option against "s
v
n-remot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
e
r
land
t72
0
1
.
24: Add r
e
fspec to
k
eep -
-
track w
o
rking
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
32
0
0
.
39: tracki
n
g setup
shoul
d
fail i
f
there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
checkout: Use remote
refsp
e
c
s when DWIM
m
ing track
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
2
024:
Show
f
ai
l
ure to
use refspec when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t2024: Add tests verifying
curre
n
t
DWI
M
be
h
avior
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
er
l
and
git
s
ymbolic-ref --d
e
let
e
$sym
r
ef
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
nd
Fix failure to
d
elete a pac
k
ed ref through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an Herl
a
nd
t1400-update-ref
:
Add t
e
st verifying
b
ug
with symr
e
fs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rl
a
nd
not
e
s-merge:
D
on'
t
remove
.
git/N
O
TES_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
no
t
es-merge
:
use opendir/readdi
r
instea
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
rland
t3310: illustrate failu
r
e to
"
n
otes merge -
-
c
o
mmit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
H
erl
a
nd
fast
-
i
m
port:
Fix i
n
co
r
rect fanout level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herl
a
nd
t9301: Ad
d
2nd
testcas
e
exposin
g
bugs in fast-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
t9
3
0
1
: Fix
testcase cove
r
i
n
g u
p
a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
Herland
t5400:
Fix a
couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
He
r
land
Mark di
r
s
tat erro
r
messages for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herlan
d
Improve error handling
w
hen parsin
g
d
i
rstat paramet
e
r
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
New
--dirsta
t
=lines mode,
d
oing di
r
sta
t
a
na
l
ysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow sp
e
cifying --
d
irstat cut
-
off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
c
o
nfig variabl
e
for speci
f
ying default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herl
a
nd
Refac
t
or --dirstat
parsing; deprecate -
-
c
umulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Make --dirstat=0
output directo
r
ies
t
h
at contrib
u
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several tes
t
cases for --dirstat
a
nd friend
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
-
-
d
irsta
t
:
I
n
case
of renames, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han
H
erla
n
d
Teach --dirstat n
o
t to com
p
le
t
e
l
y i
g
nore r
e
arranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
Herland
--dirstat-by-file:
M
a
ke it fast
e
r and mo
r
e co
r
r
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
H
erland
--
d
irstat: D
e
scribe non-obvious di
f
ferenc
e
s relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Her
l
and
Ma
k
e "git notes
add" mo
r
e user-
f
r
i
endly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n
H
e
rl
a
nd
log/pre
t
ty-options:
D
ocument
--[no
-
]notes and depre
c
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joh
a
n
Herlan
d
branch/checkou
t
--trac
k
: Ensure th
a
t upst
r
eam branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Jo
h
an Herland
push
.
default:
Re
n
ame 'tracking' to 'upstrea
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erland
Provide 'git
merge --abor
t
' as a synonym to 'git rese
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
c
m
d_merg
e
(): Parse options b
e
fore
checkin
g
MER
G
E_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
P
r
ovide 'git no
t
e
s
get
-
ref' to easi
l
y retri
e
ve
c
urrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge: Add testcases for merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git
n
otes
m
erge: Add anothe
r
a
u
to-resolving strateg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git n
o
tes
merge: --commit sh
o
uld
fa
i
l if under
l
ying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erlan
d
git not
e
s m
e
rge: List co
n
flicting
no
t
es in notes
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
e
rge: Manual conf
l
ic
t
resolution, part 2
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Her
l
an
d
git
notes me
r
ge: Manual conflict reso
l
ution, part 1/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docume
n
t
a
t
i
on: Preli
m
inary
docs
on
'git notes mer
g
e
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
git notes merge:
Add
a
ut
o
matic co
n
flict re
s
olvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git no
t
es
m
erge:
Handle real, no
n
-conf
l
ict
i
n
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
built
i
n/notes
.
c: Refactor
c
reation
of notes com
m
its
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes mer
g
e:
Initial imp
l
ementati
o
n
h
andling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/
n
otes
.
c
:
Spl
i
t notes
r
ef D
W
IMmery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use
t
w
o newline
s
(
i
nstead of one) w
h
en concatenat
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(t
r
ivia
l
) t3
3
0
3
: Indent
with tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
es
.
h/c: Propag
a
te combine_
n
otes_fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
no
t
e
s
.
h/c: A
l
low combine_note
s
functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
notes
.
c
:
Re
o
rder f
u
nct
i
ons in preparation
f
o
r
n
e
xt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
h: Make d
e
fault_notes_ref() available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
(trivial) notes
.
h: Mino
r
d
oc
u
mentati
o
n
f
ixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an
H
erland
notes
.
c: Hexify SH
A
1 in die() message fro
m
in
i
t
_
not
e
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
not
e
s:
D
on't cr
e
ate (em
p
ty) c
o
mmit w
h
en removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Ena
b
le custom sc
h
e
mes for c
o
lumn colors in the graph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
e
r
l
and
Make grap
h
_next_
l
ine() available in the
g
raph
.
h
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
revision:
T
u
rn
o
f
f hist
o
ry si
m
plification in -
-
ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
r
e
v
ision
:
Fix typo in --ancestry-p
a
th error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an He
r
land
D
o
cumentation/re
v
-lis
t
-o
p
tions
.
t
x
t: Explain
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentat
i
on/rev-list-op
t
ions
.
t
xt: Fix m
i
s
s
i
ng l
i
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
oh
a
n Herland
diff
.
c
:
Ensure "index $from
.
.
$
t
o
" li
n
e cont
a
ins unam
b
igu
o
us
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herl
a
nd
builtin-notes: Minor (mostly pa
r
se_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an
H
e
rl
a
nd
submodule summa
r
y: Don't barf when invo
k
ed in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
b
uilti
n
-notes: Add "c
o
py" subcom
m
a
nd for copyi
n
g
n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Misc
.
refactoring of argc
and ex
i
t value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-n
o
t
e
s: Add -
c
/-C op
t
i
ons for r
e
using
n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
builtin-not
e
s: Refactor
h
andlin
g
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-note
s
: Deprec
a
te th
e
-m/-F optio
n
s
for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s: Ad
d
"append"
s
ubcommand
f
or
a
ppending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
b
u
iltin-notes: A
d
d
"add"
s
ubcommand for adding not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
builtin-n
o
tes: Ad
d
--m
e
ssage/
-
-file a
l
iases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n H
e
rla
n
d
bui
l
tin-n
o
tes: A
d
d "list" subc
o
mm
a
nd for
l
isting n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Documentat
i
on
:
Gener
a
liz
e
g
it-notes docs
t
o 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "prune" subcomma
n
d
f
or remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
P
I: prune_notes(): Pr
u
ne notes that belong t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
t3305
:
Verify
t
hat r
e
m
oving notes tr
i
gge
r
s aut
o
ma
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next