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
J
o
han Herland
notes: empty no
t
e
s
s
hould be
shown
by 'git
log'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Joh
a
n Herlan
d
builtin
/
notes:
add --allow-empty, to allow s
t
o
ring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
builtin/n
o
tes:
s
p
l
i
t
crea
t
e_note() to cla
r
ify add vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herl
a
nd
builtin/notes: simplify
early exit cod
e
in add(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Jo
h
a
n
Herland
builtin/notes: refactor n
o
te file path into struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
bui
l
t
i
n/no
t
es: imp
r
ove
naming
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
ohan
H
er
l
and
t33
0
1: verify
that
'
git notes' remo
v
es empty notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan He
r
land
builtin/n
o
tes: f
i
x prem
a
ture failure when trying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Johan Her
l
and
Git
2
.
0
:
git
s
vn: Se
t
defa
u
l
t
--pre
f
ix='o
r
igi
n
/
'
if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Johan Herl
a
nd
n
o
te
s
: di
s
a
llow reusing non-b
l
ob as a note object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
J
o
h
a
n Herland
sha1_file
.
c:
c
r
e
ate_tmpfile(
)
: Fix race when
c
reating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
git
-
svn: Warn about changing def
a
ult for --prefix
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herl
a
n
d
Documentatio
n
/git-svn:
P
rom
o
te the use of --prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan Herland
sample pre-
c
ommi
t
hook:
use --boo
l
when
r
etrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an H
e
rland
t
3
200: Add test demonstr
a
t
i
n
g minor re
g
ressi
o
n in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
Refer to branc
h
.
<na
m
e
>
.
remote/mer
g
e when docume
n
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
Herland
t3200: Min
o
r fi
x
when preparin
g
for trac
k
i
n
g
f
ailure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t
2024:
F
ix &&-chaining
and
a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n Herland
M
o
ve
c
r
eate_notes_commit() from n
o
tes
-
merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Mo
v
e
copy_note_f
o
r
_r
e
write +
friends
f
rom buil
t
in/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herland
finish_copy_note
s
_for_rewrite(): Let caller prov
i
de
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
g
l
ossary: Up
d
a
t
e
a
nd rephrase the de
f
inition of a r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Va
l
i
d
ate trackin
g
b
ranch
e
s
with refsp
e
cs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t
9
114
.
2: Don't use --track opti
o
n
a
gainst
"s
v
n-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n H
e
r
land
t7201
.
24:
A
dd refspec to ke
e
p -
-
tra
c
k wo
r
king
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t3200
.
39: tracking
s
etup should fai
l
if
there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erl
a
nd
checkout: Use re
m
ote refspecs when DWI
M
m
ing tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan H
e
rland
t2024: Show failur
e
to us
e
refspec when D
W
IMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han H
e
rland
t2024: Add tests v
e
rifying c
u
rrent DWIM behavi
o
r of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han
H
erlan
d
git
s
ymbolic-ref --de
l
ete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herland
F
i
x failure
to dele
t
e a packed ref thro
u
gh a symre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herland
t1400-update-ref:
Add
t
est ver
i
fying bug w
i
th symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merg
e
:
D
o
n
't re
m
o
v
e
.
g
i
t
/
NOTES_MERGE_WOR
K
T
REE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rl
a
nd
notes-merg
e
: u
s
e
opendir/
r
eaddir in
s
tead of u
s
in
g
re
a
d_d
i
r
e
c
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han
H
erland
t3310:
illustrate
f
a
ilure t
o
"notes mer
g
e
-
-
com
m
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
fast-impor
t
: Fix incorrect fanout le
v
el
w
hen
m
o
difying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rlan
d
t
93
0
1: Add 2nd testcase ex
p
osing
bugs in fas
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han He
r
land
t
9
301: Fix testcase
co
v
ering up a bu
g
in fas
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Her
l
a
nd
t5400: Fix
a
couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an He
r
land
Mark dirstat
error messages for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Im
p
rove error handling when parsing dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rl
a
n
d
New --
d
irstat=lines mode, doing dirstat analysis bas
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow sp
e
cifying
-
-dirstat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config var
i
able for specifying default --dirs
t
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
nd
Re
f
acto
r
--d
i
rstat parsing; d
e
precate --
c
u
mulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mak
e
--dirstat=0 output director
i
es that cont
r
ib
u
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
d
d s
e
ve
r
al
testcases for -
-
di
r
s
t
a
t and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
h
an
H
erla
n
d
-
-d
i
rstat: In case of
renames, use target fil
e
name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
a
n
d
Teach --dirstat
n
ot to
co
m
pletely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Her
l
a
n
d
--dirstat-b
y
-file: Mak
e
it faster a
n
d
m
ore
correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
ir
s
tat: Describe non-ob
v
ious diffe
r
enc
e
s relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n Herland
Make "git
n
o
t
es add"
m
ore use
r
-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an
H
e
r
l
a
n
d
log/
p
retty-opt
i
on
s
: Docume
n
t
-
-
[n
o
-]n
o
tes and
d
e
prec
a
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
e
rlan
d
br
a
nc
h
/
c
he
c
kout
--track: E
n
s
ure that upstre
a
m b
r
anch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
H
erland
push
.
default:
Rename '
t
ra
c
king
'
t
o
'ups
t
re
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Prov
i
d
e 'git merge --abort' as a sy
n
o
n
ym to 'git r
e
se
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
cmd_merge(): Parse options
b
efor
e
checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git n
o
tes get-ref' to easily retrieve curren
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
gi
t
notes mer
g
e: Add testcases fo
r
merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
He
r
land
git notes merg
e
: Ad
d
another au
t
o
-
r
esolving
s
tra
t
eg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes
m
erge: --commit should fail if und
e
rly
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git
n
o
t
es
m
e
rge: List conflicting note
s
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
c
o
n
flict resoluti
o
n
, part
2
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git
n
otes merge: Manual confl
i
ct resolution, p
a
rt
1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Documentation:
Prelimina
r
y docs on
'
git notes
m
e
rge
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git
notes merge: Add
automa
t
ic c
o
n
fl
i
ct reso
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
git no
t
es merge: Ha
n
dle
real, non-con
f
licting note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erland
builtin/note
s
.
c: Refactor c
r
eation of
n
ote
s
commit
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
gi
t
n
o
t
e
s merge: Initial implem
e
n
t
ation
han
d
ling
t
rivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
builtin/no
t
es
.
c: Split
n
o
tes ref DW
I
Mm
e
ry
into a sepa
r
at
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
notes
.
c: Use two newline
s
(instead
o
f one) when
c
o
n
catenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(trivial) t3303: Indent with
t
a
b
s instea
d
of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
n
otes
.
h/c: Pr
o
pagate combine_not
e
s_fn r
e
turn valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n He
r
land
n
o
tes
.
h
/c
:
Al
l
ow combine_notes fu
n
ct
i
ons to rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
n
o
te
s
.
c: Reorde
r
f
unctions
in prep
a
r
ation
for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Ma
k
e default_notes_ref() available in no
t
es API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
(
trivial) note
s
.
h
: Minor d
o
cumentation fixes to copy_
n
otes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herla
n
d
note
s
.
c:
He
x
ify SHA1 in die() message fro
m
init
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
H
erlan
d
not
e
s
: Don't creat
e
(emp
t
y) commit
w
hen
r
emoving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
Enable custom sc
h
em
e
s fo
r
col
u
mn colors in t
h
e
g
raph
AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
l
and
Make graph_
n
ext
_
li
n
e() avai
l
abl
e
i
n
the g
r
aph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herlan
d
revision: Turn
o
ff history simp
l
ification
i
n -
-
ances
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
re
v
ision: Fi
x
ty
p
o in --ance
s
try-pa
t
h
error m
e
ssage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
Document
a
ti
o
n/
r
ev-list-o
p
tion
s
.
txt: Explain --ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documenta
t
ion
/
rev-list-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n Herla
n
d
diff
.
c: Ensu
r
e
"index $from
.
.
$
t
o
"
l
i
ne co
n
tain
s
u
n
ambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
H
erland
builtin-notes: Minor
(mos
t
ly parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule summary: Don't
bar
f
w
h
e
n in
v
oked in a
n
emp
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-
n
otes
:
Add "copy" subcomman
d
for copyin
g
not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
builtin-notes: Misc
.
r
e
factoring of argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes: Add -c/-C option
s
f
o
r
r
eusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
b
u
i
ltin
-
no
t
es: Refactor handling of -
F
o
p
t
i
on to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes
:
Depr
e
cat
e
the -m/-F opt
i
ons for "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
builti
n
-
notes: Add "app
e
n
d"
s
ubco
m
ma
n
d
for
a
ppending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n
-
notes:
A
dd "ad
d
" su
b
co
m
mand for addin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
built
i
n
-
notes: A
d
d --message/
-
-
f
ile alia
s
e
s for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
l
tin-notes:
A
dd "list" s
u
b
comm
a
nd
f
or listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Doc
u
mentation: Generalize git-notes do
c
s to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
uiltin-notes: Add "prune" subcommand
for
r
emoving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: pr
u
n
e
_
n
otes():
P
rune
note
s
that belong
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next