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
H
erland
sha1
_
fil
e
.
c:create_tmpfile(): Fix
r
ace wh
e
n crea
t
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Her
l
and
t3200: Add tes
t
demonstra
t
ing
minor regression in 41c21f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herlan
d
Refer to bran
c
h
.
<name>
.
remote/merge when documenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han H
e
rland
t3200: Minor fix when prepa
r
ing for trackin
g
failure
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t
2024: Fix &&-chaining and
a
couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
land
Move create_notes_commit() from notes-merge
.
c int
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herlan
d
Move copy_note_f
o
r_rewrite + friends
from builtin/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an H
e
rland
finish_copy_no
t
es_for_rewrit
e
(): Let
c
aller provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
glossary: Update and rephras
e
the def
i
n
i
tion
o
f a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
er
l
an
d
b
ranch
.
c: Validate tracking branches with ref
s
pecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t9114
.
2: D
o
n't use --track opti
o
n
against "svn-remot
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
H
erland
t
7
201
.
24: Add refsp
e
c
t
o
keep
-
-tr
a
ck working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
t3200
.
39: tracking setup should fai
l
i
f
there is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
checkout
:
Use remote refsp
e
cs
w
hen DWIMmi
n
g
tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Show fai
l
ur
e
t
o
u
s
e
r
efspec when DW
I
M
ming
r
emote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t20
2
4: Add tests v
e
rifying c
u
rr
e
nt DWIM behavio
r
of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
oh
a
n Herland
git
s
ymbolic-r
e
f --delete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Her
l
and
Fi
x
failure to
delete a pa
c
ke
d
r
e
f th
r
ough a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400
-
u
p
d
at
e
-ref: Ad
d
test
v
erifying bug with symref
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes
-
merge: Don't remove
.
git/NOTES_MERGE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan
He
r
l
a
nd
notes-merge: us
e
opend
i
r/readdir inst
e
ad o
f
using read_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t331
0
: illustrate failure
t
o "
n
ote
s
merge
--co
m
mit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erlan
d
fast-import: Fix incorre
c
t
fan
o
u
t
l
e
ve
l
when
modif
y
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301
:
A
dd
2
nd t
e
stcase exposing bugs
i
n
fast
-
import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
t9301: Fix testcase
c
o
v
e
rin
g
up a bug in
f
ast-impor
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Her
l
and
t
5
40
0
:
Fix a couple of
t
ypos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
M
a
rk
d
irstat error messages fo
r
trans
l
ation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herlan
d
Impro
v
e error
h
a
ndling when
p
arsin
g
d
i
rstat paramet
e
rs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
N
e
w --d
i
rstat=lines mode, doing
d
irstat analysis base
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specifying
-
-dirstat c
u
t-o
f
f percentage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add c
o
nfig variable for
s
pec
i
fyin
g
def
a
ult --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
lan
d
Refactor --d
i
rstat parsing; deprecate --cumula
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han
H
e
rland
Make --dirsta
t
=
0
output
d
irect
o
ries that contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
Add several testcas
e
s
for --dirstat and f
r
iends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
an Herland
--di
r
stat: In case
of renam
e
s, use target
filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erl
a
nd
Teach --dirstat not to completely ignore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-b
y
-file: M
a
ke it
fa
s
ter
and more correc
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herla
n
d
-
-
d
irstat
:
Describe non-obvious differe
n
ces
r
elative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "gi
t
notes add
"
more user-f
r
iendly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan
H
erland
log/pretty-options: Docum
e
nt -
-
[n
o
-]
n
otes a
n
d deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han
H
e
rl
a
nd
branch/checkout -
-
track: Ensure
that
u
pstream branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default: Renam
e
'tracking' to
'
u
pstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide
'
git
merge --ab
o
rt' as
a
sy
n
onym to 'gi
t
reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
c
md_merge(): Parse options
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 ge
t
-ref' to
e
asily retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
m
erge:
A
dd test
c
a
ses
for merging
not
e
s tre
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes
merge: Add anothe
r
a
uto-resolvin
g
s
t
rategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git note
s
merge: -
-
commi
t
sh
o
uld fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes mer
g
e:
L
i
s
t conflicting notes
i
n
note
s
merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erla
n
d
g
i
t notes merge: Manual c
o
nflict res
o
lution, par
t
2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
git
n
otes merge: Manual conflict resolu
t
i
on, pa
r
t 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Documentation:
P
r
eliminary docs on 'git
notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes m
e
rge
:
Ad
d
a
utomatic confli
c
t resolver
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
r
land
git not
e
s merge: Ha
n
d
le real,
n
on-conflict
i
n
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
bui
l
tin/notes
.
c
: Refactor creation of notes c
o
mmits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
git notes merge: Initial impl
e
men
t
ation handling triv
i
al
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
r
land
built
i
n/not
e
s
.
c:
S
p
l
i
t notes ref DWIMmery into a separ
a
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
tes
.
c: Use two n
e
w
lines (instea
d
o
f
o
ne) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
(
t
rivial) t330
3
: In
d
ent with tabs instead of s
p
aces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
notes
.
h/c: Pro
p
ag
a
te combine_not
e
s_fn r
e
turn va
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/
c
:
Allow
c
o
m
bin
e
_notes functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
lan
d
notes
.
c:
R
e
o
rder funct
i
ons in pr
e
pa
r
a
tion for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herl
a
nd
notes
.
h: Make
default_notes_ref
(
) ava
i
lable in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivi
a
l)
no
t
es
.
h: Minor d
o
cum
e
ntation fix
e
s
t
o copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c: Hexify SH
A
1 in die() message fr
o
m
init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
n
o
t
es:
Don't create (
e
mpty)
c
ommi
t
when rem
o
v
i
ng non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
er
l
and
Enable custo
m
schemes for column colo
r
s in t
h
e graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
M
a
ke graph_next_lin
e
(
)
ava
i
lab
l
e in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
revision
:
T
u
rn off history simplificat
i
on in --ances
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Her
l
and
re
v
isio
n
: Fix typo in
--ancestr
y
-path err
o
r messag
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/r
e
v-li
s
t-opti
o
ns
.
txt: Explain --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Her
l
and
Documentation/re
v
-list-optio
n
s
.
txt: Fi
x
missing
l
ine
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Joha
n
Herlan
d
diff
.
c: E
n
sure "i
n
dex $from
.
.
$to" line cont
a
ins unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan H
e
rland
built
i
n
-
note
s
:
Minor (mo
s
tly parse_options-r
e
lated
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
su
b
module summary: Don'
t
b
arf
when
invoked i
n
an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
b
uiltin-n
o
tes: Add "copy" subcom
m
a
nd for cop
y
ing note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
l
t
in-notes: M
i
sc
.
refactor
i
ng of argc and exit
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes: Add
-
c/-
C
o
ptions fo
r
reusing not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
b
u
i
l
tin-notes: Re
f
actor han
d
li
n
g
of -F opti
o
n to
allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: D
e
pr
e
cate the -m/-F options f
o
r
"git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
builtin-
n
otes: Add "
a
ppend
"
sub
c
ommand for
a
p
p
e
n
ding
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
n
o
tes: Add "add" subcommand for
a
dding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-no
t
es:
Add --messa
g
e/
-
-file a
l
ias
e
s for
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add "list" subco
m
mand for listing
note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
Documentation: Generali
z
e gi
t
-notes
d
ocs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "p
r
une" subcommand f
o
r
r
emo
v
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: prune_notes()
:
P
r
une n
o
t
e
s that
b
e
long to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
n
d
t3
3
05:
Verify that removing no
t
es triggers aut
o
matic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builti
n
-
n
o
t
es: Add "
r
emove" subc
o
mma
n
d for remo
v
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Tea
c
h bu
i
ltin-
n
otes
to remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
e
ach
n
otes c
o
de
to properly preserve non-notes
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
r
land
t3305:
Ver
i
fy that adding
m
a
ny n
o
tes with g
i
t-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3301: Ve
r
ify
s
u
ccessful annotation of non-com
m
i
ts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
Builtin-i
f
y
g
i
t-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor no
t
es con
c
ate
n
ation i
n
to
a flexi
b
le interfa
c
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herla
n
d
N
otes
A
PI: Allo
w
multiple concurrent notes trees w
i
th
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Notes A
P
I
: write_notes_tree(): Store
the n
o
tes
t
ree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: for_ea
c
h_note(): Trav
e
r
s
e the entire
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
Notes AP
I
:
get_note(): Return th
e
n
o
te annot
a
ting the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API:
remove_note(): R
e
move
note
o
b
jects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next