repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs
2013-10-28
J
ohan Herl
a
nd
sh
a
1_file
.
c:crea
t
e
_t
m
pfile(): F
i
x rac
e
wh
e
n creating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han He
r
land
t3200: Add test dem
o
n
s
t
rat
i
ng minor
r
egression in 41c
2
1f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erland
Refer to branch
.
<name>
.
remote/merge when
d
ocumenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han H
e
rland
t3200: Minor fix w
h
en preparing for tr
a
cking
f
ailu
r
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erland
t2024: Fix &&-chaining and
a
c
ouple of
t
yp
o
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herland
M
ove
cr
e
a
t
e_notes_commi
t
()
from notes-
m
erge
.
c
i
n
t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Mo
v
e copy_note_for_rewrite
+
frie
n
ds
f
rom bu
i
lti
n
/
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n Herland
finish
_
copy_notes_for
_
r
e
write()
:
Let
c
aller provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herla
n
d
glo
s
s
a
ry: Update and rephrase the defin
i
t
io
n
of a rem
o
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
b
r
anch
.
c:
V
a
l
idate tra
c
k
ing branches w
i
th refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2: Don't use --track option against "svn-r
e
mote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
a
n
Herl
a
n
d
t72
0
1
.
2
4
:
A
dd refspec to keep -
-
track
working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t3200
.
39
:
t
racking s
e
tup shoul
d
fail if
there is n
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
checkout: Use r
e
m
o
te refs
p
ecs whe
n
DWIM
m
i
ng tr
a
ck
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
a
n
d
t20
2
4: Show fail
u
re to use refs
p
ec when DWIMm
i
ng remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t2024
:
Add
t
ests ve
r
ifying
c
urrent DWIM behavior
o
f
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
nd
gi
t
symb
o
lic-ref -
-
delete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix
f
ailure to delete a
packed ref throu
g
h a s
y
mr
e
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-u
p
date-re
f
:
A
dd test ve
r
i
fying bug
with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
o
h
a
n
H
erland
n
o
tes-mer
g
e: Don't
remove
.
git/NOTES_MERGE_WO
R
KTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
notes-merge: use op
e
ndir/
r
eaddi
r
instea
d
of usi
n
g read_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
a
nd
t3310: illustrate failu
r
e to "notes merge --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast-i
m
p
ort: Fi
x
incorre
c
t fa
n
out level when modifyin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
t9301
:
Add
2
nd testc
a
se ex
p
osing bugs in fas
t
-
import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9301: Fix testcase coverin
g
up a bug
in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herla
n
d
t5
4
00: Fix a
c
o
uple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
M
a
rk dirstat error message
s
for t
r
a
n
slation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve e
r
r
o
r handling when pars
i
ng dirstat parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
N
ew --dirs
t
a
t=lines mod
e
, doing dirstat an
a
l
ysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow
spec
i
f
y
i
ng --dirsta
t
c
u
t
-off percentage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
H
e
rla
n
d
Add config vari
a
ble fo
r
sp
e
cifyin
g
d
ef
a
ult --dirs
t
at
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor
--dirstat parsin
g
;
deprecate --cumul
a
tive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
M
a
ke
-
-
d
irstat=0 outpu
t
directories t
h
at con
t
ribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
Add several tes
t
cases
f
o
r --dirstat
a
n
d fri
e
nds
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
land
--dirstat
:
In ca
s
e of renames, u
s
e target filenam
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
T
eac
h
--dir
s
tat
n
ot to com
p
le
t
ely ig
n
ore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
--dirstat-by-f
i
le
:
Make i
t
fas
t
er and more
c
orre
c
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erl
a
n
d
--
d
irstat: Descri
b
e non-obvious differences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an He
r
land
M
a
ke "git notes add" more user-frie
n
dly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herl
a
nd
log/pretty-options: Do
c
ume
n
t --
[
n
o-
]
note
s
and deprec
a
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han Her
l
and
branc
h
/checkout --
t
rack: E
n
sure
that
u
pstrea
m
b
r
anch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n Herland
pu
s
h
.
d
efault
:
Rename 'tracking' to 'up
s
tream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
Provide 'git merge --abo
r
t' as
a
synonym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
cmd_mer
g
e():
P
a
rse options before check
i
ng MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
rlan
d
Provide 'g
i
t notes get-ref' to ea
s
il
y
re
t
rie
v
e current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
n
d
git not
e
s merge: Add testc
a
ses for mergi
n
g
n
o
tes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes merge:
Add a
n
oth
e
r auto-resolving
strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git
n
ot
e
s
m
erge
:
--commit shou
l
d f
a
il if
u
nde
r
lying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herl
a
nd
git
no
t
es me
r
ge: List conflictin
g
note
s
i
n not
e
s me
r
ge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
e
r
ge: Manua
l
conflict resolution
,
part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes mer
g
e: Manual conflict r
e
solution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Docum
e
nt
a
tion: Preliminary docs on 'git
notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s merge:
Add automatic
c
onf
l
i
ct resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rlan
d
g
i
t not
e
s
mer
g
e: Handle
re
a
l
,
non-conflicting note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c
: Refactor crea
t
ion of
n
ot
e
s
commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
te
s
merge: Init
i
a
l impleme
n
tati
o
n
han
d
l
i
ng trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
lan
d
b
u
ilti
n
/notes
.
c
:
Spl
i
t notes ref DWIMmery into a separat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rlan
d
n
o
te
s
.
c: Use
two
new
l
ines (instead
of one)
w
hen co
n
catenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
(trivial
)
t3303: Indent w
i
th tabs instead of spa
c
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rland
notes
.
h/c: Propagate combine_notes_fn ret
u
rn
v
a
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
h/c: Allo
w
combine_notes functions to r
e
move
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
H
erland
n
otes
.
c: R
e
o
rder functions in prepa
r
ation for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make def
a
ult_no
t
es_ref() available in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
r
l
and
(t
r
ivi
a
l) notes
.
h: Minor documentatio
n
fixes to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
: He
x
ify
S
HA1 i
n
die() mess
a
ge f
r
om init_
n
otes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n
H
erland
no
t
es: Don't create (e
m
pty) commit
w
hen
removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
En
a
b
le
c
u
st
o
m
sche
m
es for column c
o
lors
i
n the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
Make
g
raph
_
next_line() ava
i
l
a
ble in the graph
.
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
rev
i
sion
:
Turn off history simplificati
o
n
in --
a
nc
e
str
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
r
evi
s
ion: Fix
t
ypo in
-
-
ancest
r
y
-
path error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an H
e
rland
Do
c
umenta
t
ion/re
v
-list-opt
i
o
ns
.
txt: Ex
p
l
a
in -
-
ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
Document
a
tion/rev-list
-
options
.
txt:
F
ix missin
g
line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Her
l
and
diff
.
c: Ensure "inde
x
$
f
rom
.
.
$to" line contai
n
s unambig
u
ous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan Herl
a
nd
built
i
n-note
s
:
Minor (m
o
stly parse_option
s
-relate
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Joha
n
Her
l
an
d
submodu
l
e summary: Don't barf when i
n
voked in an em
p
ty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in
-
notes: Add "copy
"
subc
o
mmand
for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-notes: M
i
sc
.
refa
c
toring of arg
c
and
exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
b
u
iltin-notes: Add -c/-C
options
f
o
r reus
i
ng notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
ilti
n
-
n
o
te
s
: R
e
f
actor
handling of -
F
option to allo
w
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
b
u
iltin-not
e
s: Depreca
t
e the
-m/-F options
for
"
git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builti
n
-no
t
es: Add "append" subcomm
a
nd for
a
p
pending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin
-
not
e
s
: Ad
d
"
add" subcom
m
and for add
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-
n
otes: Add --me
s
sage/--file ali
a
ses for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin
-
notes: Add
"list"
subc
o
mmand
for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Documentation: Genera
l
iz
e
g
i
t
-note
s
d
o
cs to 'ob
j
ects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes:
Add "prune
"
subcommand fo
r
r
e
movin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
lan
d
No
t
es API: prune_notes(): Prune
n
o
t
e
s that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
t3305: V
e
ri
f
y tha
t
removin
g
n
otes triggers a
u
tomatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rlan
d
builtin-notes: Add "remove" subc
o
m
m
and
for removin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
Te
a
ch buil
t
in-notes t
o
remov
e
empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Teach notes code
t
o proper
l
y p
r
eserve non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305:
V
eri
f
y that adding ma
n
y not
e
s with git-note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3301: Verify
succ
e
ssful annot
a
tion of non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
Builtin
-
ify git-note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Refactor notes concatenatio
n
into a fl
e
xible in
t
erface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes API: Allow multiple concurrent n
o
tes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
e
r
l
an
d
Note
s
API: w
r
ite_notes
_
tre
e
()
:
Store the notes
t
ree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Not
e
s API: for_each_not
e
()
:
T
r
a
ve
r
se the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
l
and
Notes A
P
I: get_note()
:
Retur
n
the note
a
nnotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: remove_not
e
():
Remove
n
ote objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next