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
Fix unclosed here document in t3301.sh
2014-11-14
J
o
han
H
erland
t3301: modernize s
t
yle
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
J
o
han H
e
rland
notes: empty notes s
h
o
u
ld be shown by 'git lo
g
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan
Herland
builtin/not
e
s: add
-
-all
o
w-empty,
t
o
al
l
ow
s
tor
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herl
a
nd
builtin/notes:
sp
l
it cre
a
te_not
e
() t
o
clarify add vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
J
ohan Herland
builtin/notes: simplify ea
r
ly exit code
in ad
d
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herl
a
n
d
builtin/notes: ref
a
ctor
no
t
e file p
a
th into
struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
ohan H
e
rland
built
i
n/notes:
i
mprove na
m
ing
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
o
han Herland
t3301:
verify
t
h
at
'
git notes' rem
o
ves em
p
ty notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan H
e
rlan
d
builtin/notes: fix pr
e
m
a
t
ur
e
f
ailure when trying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
J
o
han
Herlan
d
Git
2
.
0:
git s
v
n: Set default --prefix=
'
origin/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Johan
Herland
notes: disallow
r
e
u
s
in
g
non
-
blob as
a
note ob
j
ect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Johan
H
er
l
a
n
d
sha1_file
.
c:create_tm
p
file(): Fix
ra
c
e when c
r
eating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Joh
a
n Herland
git-svn: Warn
a
bout
c
hanging default for --p
r
efix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
J
o
han Herland
Document
a
t
i
on/gi
t
-svn
:
Pr
o
mote th
e
use
o
f --prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan Herland
sample pre-commit ho
o
k:
u
se --bool when retr
i
eving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Herlan
d
t32
0
0: Ad
d
t
e
st
d
em
o
nstrating minor regressio
n
in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Refer t
o
b
ranch
.
<na
m
e>
.
remote/merge when
documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Her
l
an
d
t3200:
M
inor fix wh
e
n p
r
eparing for tr
a
c
k
i
n
g failu
r
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herland
t20
2
4: Fix
&
&
-chaining and a couple of t
y
pos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan H
e
rland
Move cre
a
te_notes
_
c
o
mmit() f
r
om notes-mer
g
e
.
c in
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
M
o
v
e
copy_
n
ote_for_rewrite
+
f
r
i
ends from
b
u
iltin/note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
ohan Herland
f
inish_c
o
py
_
no
t
es
_
for_
r
e
w
rite(): Le
t
calle
r
provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
gloss
a
r
y:
Updat
e
and rephra
s
e the definition
o
f a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
b
ranc
h
.
c: Validate tracking br
a
n
c
h
e
s
with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erla
n
d
t9114
.
2: Do
n
't use -
-
t
r
ack option against "s
v
n-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erl
a
n
d
t72
0
1
.
24: Add ref
s
pec t
o
keep -
-
track
w
orking
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan He
r
land
t
3200
.
39:
tr
a
c
king
s
etup
should fail if there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
ha
n
He
r
land
checkout: Use rem
o
t
e
r
e
f
s
p
ecs when DWIMming tr
a
cking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
H
erland
t
2024: Show failure
to u
s
e ref
s
p
ec w
h
en DW
I
Mming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t2024: Add t
e
sts veri
f
y
ing current DWIM
behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an H
e
rl
a
n
d
git symbolic-re
f
--delete $symre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
Fix failure to d
e
l
ete a pac
k
ed ref t
h
ro
u
gh a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Her
l
and
t
1
4
00-upd
a
t
e-r
e
f:
Add test ve
r
ifying bug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-m
e
rge: Don't
r
emove
.
git/NOTES_MERG
E
_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
He
r
land
n
o
tes-merge: use opend
i
r
/r
e
add
i
r instea
d
of using read_d
i
rec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t
3
310:
i
l
lustrat
e
fa
i
l
ure to "n
o
tes merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
fast-impor
t
: F
i
x
i
ncor
r
ect
fanout le
v
el wh
e
n modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
t9301: A
d
d 2nd te
s
tcase exposing bugs in fast-
i
m
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herla
n
d
t9
3
0
1
: Fix test
c
ase cover
i
n
g
u
p
a bu
g
in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a coup
l
e
of typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n H
e
rland
Mark dirst
a
t error me
s
s
age
s
for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Improve error handling when parsi
n
g dirstat paramete
r
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
Herland
N
e
w --d
i
rsta
t
=
l
ines mo
d
e, doing dir
s
tat
analysis
bas
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Al
l
ow
s
pecif
y
in
g
--
d
irstat
c
ut-off per
c
entage a
s
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Her
l
and
Add config variab
l
e f
o
r spe
c
i
f
ying
defaul
t
-
-
d
irstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor --dirstat parsing;
d
eprecate --cu
m
ulativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mak
e
--di
r
stat=0 outp
u
t d
i
re
c
tories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erla
n
d
A
d
d se
v
eral testcases fo
r
--
d
irstat and frie
n
ds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
land
--di
r
stat: In case of renames, use
ta
r
get fil
e
name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
Tea
c
h
-
-dirstat not
t
o completel
y
igno
r
e rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
--di
r
stat-by-file: Make
i
t f
a
ster a
n
d more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan
H
e
rl
a
nd
--d
i
rstat: Describe n
o
n
-
o
bv
i
ous di
f
ferences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
a
n
Herland
Make "g
i
t notes add" more
u
ser-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
e
r
lan
d
log/pretty-opti
o
ns:
Document -
-
[no-]notes and dep
r
e
c
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan H
e
rl
a
n
d
b
r
an
c
h
/
checkout --track:
E
n
s
ure tha
t
up
s
t
r
eam bra
n
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herla
n
d
push
.
default:
Rename 'tracking' to
'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herla
n
d
Provide 'git merge --abort
'
as a synonym
to 'git res
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herl
a
nd
cmd_merge(): Parse opt
i
ons befor
e
checki
n
g MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erla
n
d
Provi
d
e '
g
it notes
g
et-ref
'
t
o easi
l
y r
e
t
r
ieve
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
o
tes
merge: Add testcases f
o
r merging notes tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge: Add another auto-resolving s
t
ra
t
e
gy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merge: --comm
i
t sho
u
ld fail
i
f underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
land
git notes merge
:
L
i
st conf
l
icti
n
g
n
otes in no
t
es merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
g
i
t n
o
tes
merge: Manua
l
conflict resolution, p
a
rt 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes m
e
rge: Manual con
f
lict resolution, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Doc
u
mentation: Preliminary
d
ocs
on 'git no
t
es mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
it notes merge: Add aut
o
matic conflict resolver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n
H
e
rlan
d
g
it notes merge: Handle
real, non-
c
onflicting note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
buil
t
in/not
e
s
.
c: Ref
a
ctor creation o
f
note
s
c
ommi
t
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Initi
a
l implemen
t
ation handling t
r
i
vial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
bu
i
ltin/notes
.
c: Split notes ref
DWIMmery into a separa
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c:
Use t
w
o newlines
(in
s
tead of one) whe
n
concaten
a
tin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
(tri
v
i
a
l) t3303: I
n
dent
with
tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herlan
d
notes
.
h/c
:
Propag
a
te combine_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herlan
d
notes
.
h/c
:
Al
l
ow c
o
mbine_notes f
u
nctions
to rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c: Reord
e
r functions in preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
h
:
Make
def
a
ult_notes_ref
(
) availa
b
l
e in
n
otes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Her
l
and
(
t
rivial) notes
.
h: Minor
documen
t
ation fixes
t
o copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c:
H
exify SHA1 in die() message
f
ro
m
init
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n He
r
la
n
d
notes
:
Don't
create (e
m
pty) commit when remo
v
ing
n
o
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rland
Enable custom
sche
m
es for c
o
lumn col
o
rs in t
h
e graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make g
r
aph_next_li
n
e() available in the graph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision:
Turn off history si
m
plification in --ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
ev
i
si
o
n
:
Fix typo in -
-
ancestry-path erro
r
mess
a
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
D
o
cumentation/r
e
v-
l
ist-options
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
Documen
t
ation/rev
-
li
s
t
-
options
.
tx
t
: Fi
x
mi
s
sing
l
ine
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan
Herland
diff
.
c: Ensure
"
index
$
f
rom
.
.
$to"
l
ine c
o
ntains un
a
mbi
g
uous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan Herland
builtin-notes: Mi
n
o
r
(
mostly parse_options-
r
elated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
su
b
mod
u
le summary: Don't b
a
r
f whe
n
invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "
c
opy" subcommand fo
r
copying note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
buil
t
i
n-notes: Misc
.
refactoring
o
f
argc and
e
xit v
a
lu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
bui
l
tin-notes: Add -c
/
-C op
t
ions for reu
s
ing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
buil
t
in-notes:
R
efactor
h
and
l
ing of
-
F
option to
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s: Deprecate the -m/-F options for
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
ote
s
:
Ad
d
"app
e
nd" subc
o
mman
d
f
or ap
p
e
n
di
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
bui
l
ti
n
-notes: Add "add" subcomman
d
fo
r
adding not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add --mes
s
age/--file aliases for -
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd "li
s
t" subcommand for listin
g
n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
D
o
cumentati
o
n: Generalize g
i
t
-notes doc
s
to '
o
bj
e
cts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
builtin-notes: Add
"
pr
u
ne" subc
o
mmand
f
or re
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next