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
t3301: modernize style
2014-11-14
Johan
Her
l
and
t3301: modernize st
y
l
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-12
Jo
h
an
H
erland
not
e
s: e
m
pty notes should be sh
o
wn by 'git log'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-12
Jo
h
an Herland
builtin/notes:
add --allow
-
empty
,
t
o
a
l
l
o
w
storing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-12
Jo
h
an Herlan
d
builti
n
/
n
o
te
s
: split cr
e
a
t
e
_note() to cla
r
ify add vs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-12
Joh
a
n Herland
buil
t
in
/
notes: si
m
plify earl
y
exit c
o
de
in add
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
builtin/note
s
: re
f
actor note fi
l
e
path in
t
o
s
t
r
uct
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
builtin/notes: impro
v
e naming
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
Johan
Herland
t3301: ve
r
ify that 'git not
e
s' rem
o
ve
s
empt
y
no
t
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
builti
n
/notes:
f
ix premat
u
re failure when tr
y
ing to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-04-19
Johan Herland
G
it 2
.
0: git s
v
n:
Se
t
d
ef
a
u
l
t
--pre
f
ix='ori
g
in/' if
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-02-20
Johan Herland
notes
:
disallow reusing non-blob as a note obje
c
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-28
Johan Herlan
d
sha1_file
.
c:create_tmpfile(): Fix race
w
hen cre
a
ting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
git-svn: Warn
a
bout cha
n
gin
g
def
a
ult for --p
r
efix in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herla
n
d
Documentati
o
n/
g
it-svn: Promote the
u
se of --prefix
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-24
Johan He
r
land
sample pre
-
c
o
m
mit hook: use --bool when retrieving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t
3
200: Add test demonstrating minor regression in 41c
2
1
f
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n
Herland
Refer to
branch
.
<name
>
.
re
m
ote/merge
w
hen document
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
la
n
d
t3200:
M
ino
r
fix w
h
e
n pr
e
pari
n
g
for tracking f
a
ilur
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han
H
erlan
d
t2024: Fix &&-chai
n
i
ng
a
n
d
a
c
o
up
l
e of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
M
ov
e
crea
t
e_
n
otes_c
o
m
m
it(
)
fro
m
notes-
m
erge
.
c into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n
H
erland
Move copy_note_for_rewr
i
te
+
f
rien
d
s from builti
n
/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
H
er
l
a
n
d
finish_copy_notes_for_r
e
write(): Let caller pr
o
vide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
glos
s
ar
y
: Update and rephrase the d
e
f
i
n
ition of a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: V
a
l
idate trac
k
ing branches wi
t
h refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
9114
.
2: Don
'
t
u
se --tra
c
k opt
i
on against "s
v
n-remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t72
0
1
.
24: Add refspec to kee
p
--t
r
ac
k
working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t
3
20
0
.
39: t
r
ac
k
ing setup should fail if there is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
checkout: Use remote r
e
fspecs
when DWIM
m
ing tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
e
r
l
a
n
d
t2
0
24: Show f
a
ilur
e
to use refspec when DWIMming remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
n
d
t2024: Add tes
t
s
veri
f
ying cu
r
rent DWIM
behavio
r
o
f
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan
H
erlan
d
git symbolic-
r
ef --delete $symre
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herland
Fix fail
u
re t
o
delete a pa
c
ked ref through a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han H
e
rlan
d
t14
0
0-u
p
date-re
f
:
Add test verifying bug
w
it
h
s
y
mre
f
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herland
n
o
tes-me
r
ge: Do
n
't rem
o
ve
.
g
it/NOTES_MERGE_WORKT
R
EE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
lan
d
notes-merge: use opendi
r
/readdir instead of using read_
d
irec
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t33
1
0:
i
l
lustrate failure to "notes
m
erge
-
-comm
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
lan
d
fast-im
p
ort:
F
i
x inco
r
rect fanout level when modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an
Herland
t9301: Add 2nd tes
t
cas
e
ex
p
osing bugs
in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
a
n He
r
la
n
d
t9301: Fix testcase cov
e
ring up a bu
g
in fast-impor
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a
c
o
uple of typo
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Mark
dirstat
e
rror message
s
for
tra
n
slatio
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Improve error
hand
l
ing when parsing dir
s
tat param
e
ters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
New --dirstat
=
li
n
e
s mode,
d
oing
dirst
a
t
anal
y
sis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Allo
w
s
p
eci
f
ying
-
-dirstat cut-off percen
t
age
as
a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rland
Add
config variab
l
e for specifying defau
l
t --dirsta
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Re
f
a
ct
o
r --dirstat parsing
;
deprecate --cum
u
lat
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Make --dir
s
tat=0
o
utput directories that con
t
ri
b
ute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Add sev
e
ral testcases f
o
r
--dir
s
tat an
d
friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--di
r
stat: I
n
ca
s
e
o
f rena
m
es, use ta
r
get
filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --
d
irstat not to completely ignore
rearrang
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--
d
irstat-by
-
f
ile: Make it fast
e
r and more
c
orrect
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Her
l
and
-
-di
r
stat: Describe non-o
b
vious differences rela
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herl
a
nd
Make "git notes ad
d
" more user-
f
r
iendly when
there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan H
e
rland
log/pretty-options: Document --[no-]note
s
a
n
d deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han
Herland
b
r
a
n
c
h/checkout
-
-
track:
E
nsur
e
that
upstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
J
o
h
an
Herland
push
.
default
:
Re
n
ame
'tracking
'
to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
P
rov
i
de 'g
i
t mer
g
e --a
b
ort'
a
s a
synonym
to 'git
reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n He
r
land
c
m
d_merge(): Parse op
t
io
n
s
before
checki
n
g ME
R
GE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
Provid
e
'g
i
t no
t
es g
e
t-ref' to easil
y
retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
gi
t
notes merg
e
: Add testca
s
es
f
or
me
r
ging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git
notes me
r
ge: Add another auto-re
s
olving str
a
tegy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
a
nd
g
i
t not
e
s mer
g
e: --commit s
h
ould
fa
i
l if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Li
s
t c
o
nflicting notes in n
o
tes m
e
rge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n H
e
r
land
git
n
otes merge: Manual conflict resol
u
tion, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge: Manu
a
l conflict resolut
i
on, p
a
rt 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
D
ocumentation: P
r
elimina
r
y
d
ocs
o
n 'g
i
t notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
g
it notes merge: Add auto
m
atic
c
onflict resol
v
ers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
git notes
m
erge
:
Handle real, non-
c
onflictin
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bu
i
ltin/not
e
s
.
c
: Refact
o
r
crea
t
ion of notes co
m
m
i
ts
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herl
a
n
d
git notes merge
:
I
nitial
implemen
t
ati
o
n handlin
g
tr
i
vial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
builtin/note
s
.
c: Sp
l
it notes ref DWIMmery int
o
a se
p
a
r
at
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c:
U
se two newlines (instead of one) when concatenati
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herlan
d
(trivial) t3303:
I
ndent wi
t
h t
a
bs instead
o
f spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Propagate combine_notes_fn
return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
notes
.
h/c: Allow combine_notes
fu
n
c
tions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
n
o
tes
.
c
:
Reorder
f
unctions in
preparatio
n
for ne
x
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
no
t
es
.
h: Make d
e
fault_notes_ref() available in not
e
s A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
t
rivia
l
) note
s
.
h
:
M
inor
docume
n
t
a
tio
n
fixes
t
o copy_n
o
t
e
s(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
c
: Hexify SHA1 in di
e
(
) mess
a
ge from init_no
t
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
an H
e
rla
n
d
not
e
s: Don't create (e
m
pty) commit wh
e
n removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
Enable
c
u
s
tom schemes for
c
olu
m
n
colors
in the g
r
aph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
M
ake graph
_
next_line() available i
n
the graph
.
h
A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
a
n
Herla
n
d
r
e
vi
s
ion: Turn o
f
f h
i
story simplification
in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fi
x
typo in --ancestry-path
error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rlan
d
Documentation/rev-list-options
.
txt: Ex
p
lain --ance
s
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herlan
d
D
ocument
a
ti
o
n/rev-list
-
options
.
txt: Fix m
i
ss
i
ng l
i
n
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure "ind
e
x
$
from
.
.
$to" li
n
e contains unambiguo
u
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-
n
o
t
es: Minor
(most
l
y parse_optio
n
s-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan H
e
r
land
s
ubmod
u
l
e summary:
Don't barf when invoked
in an e
m
pt
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
buil
t
i
n
-
n
ot
e
s:
Ad
d
"copy"
s
u
b
c
ommand for copy
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
builtin-n
o
tes: M
i
sc
.
r
e
factoring of
a
rgc
a
nd e
x
it
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
buil
t
in-notes: Add
-
c/-C option
s
f
o
r reusing no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
built
i
n-note
s
: Ref
a
c
t
or handl
i
ng of -F op
t
ion t
o
allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Deprecate
t
he -m/-F o
p
tions for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Ad
d
"
a
ppend" subcommand
f
or
a
ppend
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes:
A
d
d "add" subc
o
mmand for a
d
ding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin
-
notes: A
d
d --message/--file aliase
s
f
or
-
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes: Add "list" subcommand for listin
g
note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
D
o
c
ume
n
tation: Generalize git-no
t
es
do
c
s to '
o
b
jects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herlan
d
builtin-not
e
s: Add "pru
n
e" s
u
bcommand for r
e
movi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next