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
strbuf.h: format asciidoc code blocks as 4-space indent
2014-11-14
Joha
n
Herland
t
3301: modernize style
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Joh
a
n Herland
n
o
tes:
e
mpt
y
notes
s
hould b
e
shown by
'
git log'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan
H
e
rlan
d
bui
l
t
in/notes: add --allo
w
-empty, to allow
s
t
o
ring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
builtin/notes: split create_note() to
clarify add vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
builtin/notes: simplify
e
arly e
x
it
cod
e
in add()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
bui
l
tin/notes: refactor note f
i
le
p
ath into
struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herla
n
d
built
i
n/notes: improve naming
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
ohan Her
l
and
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
h
a
n Herland
buil
t
i
n/notes: fix premature failure when
try
i
ng to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Joha
n
Herla
n
d
G
i
t 2
.
0: git svn:
S
et def
a
ult --prefix=
'
origi
n
/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Johan Herland
notes: disallow reusing non-blob
a
s a note object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Johan He
r
l
a
nd
sha1_file
.
c
:
create_tmpfile():
F
i
x race when
cr
e
ating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
git-svn: Warn about
c
h
a
n
g
ing default for --prefi
x
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herl
a
nd
D
ocumentation/git-svn:
P
romote the us
e
o
f --prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Joh
a
n
H
erland
s
ample pr
e
-co
m
mit hook
:
use --
b
ool
w
hen retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n
H
erland
t32
0
0: Ad
d
test de
m
onstr
a
tin
g
min
o
r regr
e
ssion in
4
1c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
R
e
fer to branch
.
<
n
a
me>
.
rem
o
te
/
merge
when docu
m
enting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han H
e
rland
t3
2
00: Mi
n
or
fix
w
hen pr
e
paring fo
r
trac
k
ing failu
r
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024: Fix
&
&-cha
i
ning an
d
a
couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herl
a
nd
Move create_notes_commit() f
r
om note
s
-
m
erge
.
c in
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move copy_note_f
o
r_re
w
ri
t
e +
frien
d
s
from b
u
i
ltin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Her
l
and
finish_copy_not
e
s_for
_
rewrite(): Let ca
l
ler provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glossary
:
Update and rephrase the
defini
t
ion
o
f
a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
a
n
d
b
r
a
nch
.
c: Validate tracking
br
a
nches with ref
s
pecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
h
an Herla
n
d
t
9
114
.
2
: Don't use
-
-t
r
ack option
against "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t7201
.
24: Add refspec to keep
--track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3200
.
39:
t
racking setup
s
hould fail if there
i
s no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
checkou
t
:
Us
e
remote re
f
sp
e
c
s
when
D
W
I
Mming tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
2
024: S
h
ow
f
ailure to u
s
e
r
efspe
c
wh
e
n DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024
:
Add tests veri
f
ying cur
r
ent DWIM behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erland
git symbol
i
c-ref --delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an He
r
land
Fix failure t
o
delete a packed ref through a
s
ymref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erland
t
140
0
-upd
a
te
-
r
ef: Add t
e
st
v
erify
i
n
g
bug
w
ith symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herland
notes-merge: Don'
t
remove
.
git/NO
T
ES_MERGE_WORKTR
E
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-mer
g
e
: use
o
pendir/readdir ins
t
ead 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
J
o
han Herla
n
d
t3310: illustrate
failure
t
o
"notes m
e
rge --c
o
mmit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
fas
t
-import: Fix incorrect
f
anout
level when
m
o
d
i
fying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erland
t9301:
A
dd 2nd te
s
tcase
expo
s
ing
b
u
g
s
i
n fast-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
t
9301: Fix testcase covering up a b
u
g
i
n fa
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5
4
00:
Fix a co
u
ple of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Mark
d
irstat e
r
ro
r
m
e
ssa
g
es for tran
s
la
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Improve error ha
n
dling
w
hen parsing dirstat p
a
ra
m
eters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
New
-
-dirstat=l
i
n
es mo
d
e, doing dirs
t
at analysis
b
a
sed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
llow specifying -
-
dirstat c
u
t-off
p
ercentage as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Ad
d
co
n
fig variable
fo
r
specifyi
n
g defaul
t
--dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor --dirstat parsing; deprecate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Make --
d
irstat=0 output d
i
rectories that contri
b
ut
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several
testcases for --dirstat an
d
friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
-
-dirstat: In case of
r
enames, u
s
e ta
r
get filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dirstat no
t
to completely ignore
r
earrang
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
irstat-by-file: Make
it f
a
ste
r
and more cor
r
ect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
Herl
a
n
d
--dirst
a
t
: De
s
c
r
ibe
n
o
n-obvious diffe
r
en
c
es relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan H
e
rla
n
d
Make "git notes add"
m
o
re user-fr
i
endly wh
e
n there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pre
t
ty-optio
n
s: Document --[no-]notes and depr
e
c
a
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joh
a
n Herland
branch/checkout -
-
t
r
ac
k
: Ensu
r
e
th
a
t upstr
e
am
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Joha
n
Herland
push
.
d
ef
a
ult
:
Rename 'tracking' to
'upstre
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Pr
o
vide
'git
mer
g
e
--ab
o
r
t
' as
a synon
y
m to 'git res
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge():
P
ar
s
e options befo
r
e
checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
P
r
ovide 'git note
s
get-r
e
f' to easily retrieve c
u
rrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
gi
t
notes
m
erge: Add testcases
f
o
r merging notes
t
re
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
git notes
m
e
rge
:
A
dd another a
u
to-res
o
lving st
r
ategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes mer
g
e:
--commit shoul
d
fail
i
f
underly
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
git notes me
r
ge: List conflicting notes
i
n notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merge: Manual conflict re
s
olut
i
on, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge: Manual conflict resolu
t
i
on, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herlan
d
Documenta
t
ion:
Preliminary docs on
'
g
it notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git note
s
mer
g
e: Ad
d
automat
i
c conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erland
git notes merge: Ha
n
d
l
e real, non-
c
onf
l
icting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bu
i
lti
n
/notes
.
c: Refactor creation
of no
t
es commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes merge: Initial i
m
plementati
o
n handli
n
g
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
buil
t
in/not
e
s
.
c: Split notes ref
D
WIMmery
into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
land
notes
.
c
:
Use
t
wo newlines (instead of one)
when concatena
t
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(tr
i
vi
a
l) t3303: Inde
n
t
w
ith tabs ins
t
ead
o
f spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
not
e
s
.
h/
c
: P
r
o
p
agate combine_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
h/c:
A
ll
o
w
combine_not
e
s functions
t
o
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
n
d
n
otes
.
c: Reorder functions
i
n preparation for n
e
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make
d
efault_notes_re
f
() avail
a
ble in
n
o
t
es API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
H
erland
(
trivial) notes
.
h: Minor documentat
i
on fixes to co
p
y_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
:
Hexify SHA1
in die() message from init_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
o
ha
n
H
e
r
land
n
o
t
e
s: D
o
n't create (e
m
pty
)
co
m
mit when
removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
erland
Enable cust
o
m schemes for column colors in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make
g
r
aph_next_line()
a
vailable in
the gr
a
p
h
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revisi
o
n: T
u
rn of
f
history simplificat
i
on in --ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
He
r
land
revision: Fix ty
p
o in --ancestry-path
err
o
r message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
rland
Documenta
t
i
o
n
/rev-list-optio
n
s
.
txt: Expl
a
in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
e
rland
Documentation/rev-li
s
t-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
an Herland
diff
.
c:
E
nsure
"i
n
dex
$
from
.
.
$to
"
line c
o
ntains unambiguo
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-not
e
s
: Minor (mo
s
tly
pars
e
_opt
i
on
s
-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joha
n
H
e
rland
s
ubmodule
summary: D
o
n
'
t ba
r
f
w
hen invo
k
e
d
in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-notes:
A
dd "copy" s
u
bcommand for
copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
notes: Misc
.
re
f
actoring of ar
g
c
and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes:
A
dd -c/-
C
options for r
e
using no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-n
o
tes: Refactor
handling of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-
n
otes:
D
epr
e
c
ate the
-m/
-
F
o
ptions for
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Her
l
an
d
buil
t
in-notes: Add "append" su
b
command
f
o
r appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herla
n
d
bui
l
tin-not
e
s
:
A
dd "a
d
d" subc
o
mman
d
f
or
a
dding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
builtin-notes: Add --message/--
f
ile aliase
s
f
o
r -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
bu
i
lt
i
n-not
e
s
: Add "l
i
st" subcom
m
and for list
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Docume
n
tation: G
e
n
eralize git-notes
docs
t
o
'ob
j
ects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes:
Add "prune"
subcommand
f
or removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next