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
sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs
2013-10-28
Johan Herland
sha1_file
.
c
:
cre
a
te_tmpfil
e
(
)
:
F
i
x race when cre
a
ting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t3200: Add
t
est de
m
onstrating m
i
nor regressi
o
n in
4
1c2
1
f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herlan
d
Refe
r
to branc
h
.
<name>
.
remote/
m
erge when
d
o
cumenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
a
n
Herl
a
nd
t
3
2
00: Minor fix when preparing fo
r
tracking failur
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t
2
0
2
4: Fix
&
&-chaining and
a
c
o
up
l
e of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Her
l
a
n
d
M
ove
c
r
eate_not
e
s_commit() from notes-
m
erge
.
c into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Mo
v
e
copy_
n
ote_for_rew
r
ite + friends from builti
n
/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an Herland
fini
s
h_copy_notes_f
o
r_rewrite(): Le
t
caller provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
gl
o
s
s
ary
:
Update and rephra
s
e the definition
of a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
H
e
r
land
branch
.
c: V
a
lida
t
e tracking branches wit
h
ref
s
pecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
ha
n
Herland
t9114
.
2:
D
on't use --t
r
ack
option against "s
v
n-remo
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t
7201
.
24
:
Ad
d
refspec to keep -
-
track wo
r
king
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herl
a
nd
t3200
.
39: tra
c
kin
g
set
u
p should f
a
il if there is
n
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
c
heck
o
ut
:
Use remo
t
e refspecs wh
e
n DWIMming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
ha
n
H
erland
t2024: Sh
o
w
failure to use refspec when DW
I
Mmin
g
remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t2024: Add
test
s
verifying current DWIM behav
i
or
o
f
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herlan
d
git symbolic-r
e
f --de
l
ete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herland
F
ix failure
to d
e
l
e
te a pac
k
ed re
f
through a sym
r
e
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-update-ref: Add te
s
t
v
erifying bug wi
t
h sym
r
efs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
no
t
es-me
r
ge: Don't r
e
mo
v
e
.
git/NOTES_MERGE_WORKTRE
E
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-m
e
rge: u
s
e opendir/readdir instead of
u
sing
r
ead_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan He
r
land
t
3310: ill
u
s
t
rate fai
l
ure to "
n
ote
s
merge --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
fast-i
m
port: Fix
i
ncorrec
t
fanout
lev
e
l
when modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2nd testcase exposing
bugs in fast-
i
mport
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
t93
0
1: Fix testcase cove
r
ing up a bug in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
r
l
and
t
5
400: Fix a co
u
ple of ty
p
os
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herl
a
nd
Mark
d
irsta
t
error me
s
s
ages for t
r
a
n
slation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Imp
r
o
ve error ha
n
dling when parsing d
i
rsta
t
parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dir
s
t
at=lin
e
s mode
,
doing dirstat analysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specifying --dirstat
c
u
t
-off percent
a
ge as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rlan
d
A
d
d
config v
a
riable f
o
r specifying default
-
-
d
i
rstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ref
a
c
t
or --
d
irst
a
t
p
a
rsing;
d
eprec
a
te --cu
m
ulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herlan
d
M
ake --dirstat=
0
output d
i
r
e
c
tori
e
s t
h
a
t
contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herl
a
nd
Add
several testc
a
se
s
for --d
i
rstat and
f
rien
d
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat:
I
n case of re
n
ames
,
use ta
r
get filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dirs
t
at not to compl
e
te
l
y
ignor
e
rea
r
r
an
g
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
dirstat-b
y
-file
:
Make it faster and
more
c
orre
c
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe non
-
o
b
v
i
ous diff
e
ren
c
es
relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
Make "g
i
t notes add" more
u
ser-friendly whe
n
t
h
e
r
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty-options: Docu
m
ent --[no-]
n
o
tes and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checkout
--track:
E
nsure that upstr
e
a
m b
r
anch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
defaul
t
: Rename 'trackin
g
' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Provi
d
e 'git merge --a
b
ort' as a synonym to '
g
it re
s
et
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cm
d
_merge(): Par
s
e o
p
tions before checking MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Provide 'git no
t
es g
e
t-re
f
'
t
o easily retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git
n
otes mer
g
e: Ad
d
te
s
tcases
for merging not
e
s 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
: Add anothe
r
a
u
to-
r
e
solving strat
e
gy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
rland
git not
e
s
m
e
rge: --commit sh
o
uld fail
i
f underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes m
e
rge: List
conf
l
ictin
g
no
t
es in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
git
notes
merge: Manual
c
onflic
t
resolut
i
o
n
, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
gi
t
notes merge: Manu
a
l
co
n
flict resolution,
p
art
1
/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
D
o
cum
e
ntation: Preliminary docs
o
n 'git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes merg
e
: Add au
t
o
m
atic
c
onflic
t
r
e
so
l
vers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
nd
git not
e
s merge
:
H
andle
r
e
al, non-conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
builtin/n
o
tes
.
c
:
Refac
t
or cre
a
t
ion
o
f notes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge: Initial implemen
t
a
t
ion handli
n
g tri
v
i
al
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
buil
t
in/notes
.
c: Split notes
r
ef
DWIM
m
ery
i
nt
o
a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
not
e
s
.
c: U
s
e two newline
s
(instead o
f
o
n
e) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
(t
r
iv
i
al) t3303: I
n
de
n
t with tabs i
n
stead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
notes
.
h/c:
Propagat
e
com
b
ine_
n
otes_f
n
return
value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
h/c: Allow combine_notes
functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Reorder functi
o
ns in
p
reparation fo
r
n
ext
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n He
r
land
notes
.
h
: Make defa
u
lt_notes_ref() avai
l
abl
e
in n
o
tes
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivia
l
) notes
.
h: Mi
n
or
docume
n
tatio
n
fixes to copy
_
notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
n
otes
.
c: Hexify SHA1
in
d
ie() messa
g
e from
in
i
t_
n
otes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
n
o
t
es
:
Don't
c
r
eate (em
p
ty)
c
ommit w
h
e
n re
m
oving
n
on
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
E
nable
c
usto
m
schemes for column colors in
t
he
g
r
a
ph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herla
n
d
Make gr
a
p
h
_
next
_
line(
)
availa
b
l
e in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revisi
o
n:
T
u
r
n
o
ff histor
y
simpl
i
fi
c
at
i
on in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
r
e
v
i
s
ion: Fix
t
ypo in --
a
ncestr
y
-path er
r
or me
s
sage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentatio
n
/rev-list-options
.
txt: Expla
i
n
--ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
lan
d
Do
c
u
m
entation/r
e
v-
l
i
s
t-
o
ption
s
.
t
xt: Fix
m
issing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensu
r
e
"
index $from
.
.
$to" line contains una
m
b
i
g
uous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
buil
t
in
-
no
t
es: Minor (mostly parse_options-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan H
e
rland
su
b
module
s
ummary: Don't barf when invoked in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
b
uiltin-notes: Add
"c
o
py" subcommand for copyin
g
n
ot
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
a
n
d
builtin-notes
:
M
isc
.
refactoring of
argc a
n
d e
x
it value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd
-
c/-C options for
r
eusing note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
b
uiltin-n
o
tes:
R
efactor
handling of -F option
to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bu
i
ltin-notes:
Deprecate the
-m/-
F
options for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
He
r
land
builtin-notes
:
Add "app
e
nd" subcomma
n
d for appendi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
ilt
i
n
-notes:
Add "add"
su
b
command
for adding
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
n
d
builtin-no
t
es:
A
d
d
--message/--fil
e
aliases fo
r
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-no
t
es
:
Add
"list" subcommand for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
Do
c
ument
a
tio
n
:
G
eneraliz
e
git-notes docs to 'objec
t
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
builti
n
-notes: Add "p
r
une" subcom
m
a
n
d for
r
e
moving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
No
t
es API: prune_notes
(
): Prune notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
t330
5
: Verify that removing
n
o
tes
t
rig
g
e
rs automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-no
t
es: Add "remove" subcom
m
and for removi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Tea
c
h
builtin-notes to rem
o
ve empty no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Teach note
s
co
d
e
to properly pres
e
rve non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
t3305: Verify that adding many notes with git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herla
n
d
t3301: Verify
s
uccess
f
ul
ann
o
t
ation of no
n
-
commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
Builtin-ify
g
it-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Ref
a
ctor
n
o
tes concaten
a
tion into a flexible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
N
o
tes API: Allo
w
m
u
ltiple concurrent no
t
e
s
trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API:
w
rite_n
o
tes_tree():
Store
t
he notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
No
t
es API: f
o
r_each_note(): Tra
v
e
rs
e
the
entir
e
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
get_note(): Return t
h
e
note annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes
A
PI: remove_n
o
te(): Re
m
ove note objects fro
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next