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
Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
2014-04-19
Joh
a
n Herla
n
d
Git 2
.
0: git
s
vn:
S
et d
e
fault --prefi
x
='origi
n
/' if
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-02-20
Johan Herland
notes: d
i
sallow reusing non-blob as a
note
object
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-28
Johan Her
l
and
sha1_file
.
c:create
_
tmpfile(): Fix race when cr
e
ating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan He
r
land
gi
t
-svn: Warn about chan
g
ing defa
u
lt for --prefix
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Joh
a
n Herland
Documenta
t
ion/git-svn: Promote the use of
-
-prefix
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-24
Johan H
e
r
land
sampl
e
pre-c
o
mmit hoo
k
: use --bool
w
h
en re
t
r
ieving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200:
A
dd test dem
o
n
s
tra
t
ing minor
re
g
r
es
s
i
o
n in 41c21
f
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Ref
e
r
t
o branch
.
<name>
.
remote/mer
g
e when documentin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herlan
d
t3200:
M
inor fix when preparing f
o
r tracking f
a
ilu
r
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han H
e
rl
a
nd
t20
2
4: Fix &&-c
h
aining and a cou
p
le
of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
Move create_notes_co
m
m
i
t() f
r
om notes
-
merge
.
c into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
a
n
Herla
n
d
M
o
ve
cop
y
_
note_for_
r
ewri
t
e +
f
rie
n
ds
from
b
uiltin/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an H
e
r
land
finis
h
_co
p
y_notes_for_rewri
t
e(): Let caller p
r
ovide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
glossary: U
p
da
t
e an
d
re
p
h
rase the de
f
i
n
ition of a
remot
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
n
d
branch
.
c: Vali
d
at
e
tra
c
kin
g
branches with
r
e
fspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
He
r
l
a
n
d
t9
1
14
.
2: D
o
n't use --track option again
s
t "svn-remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan
Herland
t7201
.
2
4: Add refsp
e
c t
o
keep --
t
rack wo
r
king
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Her
l
and
t
3
2
0
0
.
39: tracking
s
etup
shoul
d
f
a
i
l if th
e
re is
no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
check
o
ut: Us
e
r
emote
r
efspecs whe
n
D
WIMming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han
H
erland
t2024
:
S
h
o
w
fail
u
re to use
r
e
fspe
c
when DWIMmi
n
g remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
r
l
a
n
d
t2024: Add te
s
ts
v
erifying current D
W
IM
b
ehavi
o
r of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han
H
e
r
land
git symboli
c
-
r
ef --delete $sy
m
ref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
Fix fail
u
re to delete a
p
acke
d
r
ef through a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herland
t1400-updat
e
-ref: Add te
s
t
verifying bug
w
ith
symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Herland
notes-me
r
ge: Don't re
m
ove
.
git/NOTE
S
_M
E
R
G
E_W
O
RKT
R
EE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herland
n
otes-merge: us
e
opend
i
r/readdir i
n
stead
of 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 to
"
notes merge --commi
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
fast-impo
r
t: F
i
x
incorrect fanout level wh
e
n
m
o
difying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
t9301:
Add 2nd testcase exposing
b
u
gs in
fast
-
import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n
H
er
l
and
t9301
:
Fi
x
t
e
stcase covering up
a
bug in fast-
i
mport
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herland
t5400: Fix
a
couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Mark dirsta
t
e
r
ror
m
essages
for
t
ranslation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Improve error handli
n
g when parsing dirstat parame
t
e
r
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --di
r
stat=lin
e
s
mode, doing
dir
s
t
at analy
s
is base
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow s
p
ecifying --dirstat cut-
o
ff p
e
rc
e
ntage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
an
d
Add config variable for speci
f
ying default --dirst
a
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rland
Re
f
ac
t
or
--dirstat parsi
n
g
; depre
c
a
te --cu
m
ulat
i
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
M
a
k
e
--dirstat=0 outpu
t
directories
that
contribut
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
A
dd se
v
eral testcases for --dirstat a
n
d friend
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan
Herland
--dirstat
:
In case of
r
enames, use target filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rland
Teach --di
r
stat not
t
o
completely
i
gnore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
oh
a
n Herland
--dirstat-by-file:
M
ak
e
it f
a
ster and
more corr
e
ct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herla
n
d
--dir
s
tat:
D
escribe non-obv
i
ous di
f
ferences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n Herland
Make
"git notes add" mor
e
u
s
er-frien
d
ly whe
n
t
here
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
a
n
H
e
r
l
and
log/
p
retty-options: Document --[no-]notes and d
e
precate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an Herland
branch/checkout --track: Ensure
t
hat
u
pst
r
e
am bran
c
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herland
push
.
d
e
fault: Rename
'
tracking' to 'upst
r
eam'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n Herland
Provide
'
g
it merge --abort' as
a
sy
n
onym
t
o 'git
r
es
e
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
cmd_merge():
Par
s
e options before check
i
ng MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
Provid
e
'git
n
o
t
es
g
et-ref'
t
o easi
l
y
r
etrieve cu
r
rent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herland
git notes me
r
ge:
Add testcases for m
e
rg
i
ng n
o
tes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: Add ano
t
her auto-resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merg
e
: -
-
commit
s
hou
l
d
fail if
underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
m
erge: List
con
f
licting
note
s
in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t
not
e
s merge: Manual
c
onflict resol
u
tion, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
and
git not
e
s merg
e
: Manual
conf
l
ict resol
u
ti
o
n, p
a
rt 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Documentation: Preliminary docs
o
n 'git not
e
s merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
nd
git notes merge: Ad
d
automa
t
ic conflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge
:
Handle real, non-conflict
i
n
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
rland
bui
l
t
i
n/notes
.
c
:
Ref
a
ct
o
r creation o
f
notes com
m
its
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git
n
ot
e
s me
r
ge:
I
n
itial
i
mple
m
entatio
n
h
a
ndl
i
n
g
trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n He
r
land
builtin/note
s
.
c: Split note
s
r
e
f DWIMmery into
a
se
p
ar
a
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
not
e
s
.
c:
U
se
t
wo
newlines (instead
o
f one) when con
c
atenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(triv
i
al) t3303
:
In
d
ent with
tabs instead of space
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
notes
.
h
/c: Propagate
c
o
m
bine_notes_fn re
t
urn value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
n
otes
.
h/
c
:
A
llow
c
o
mb
i
ne_notes
funct
i
o
n
s to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
r
l
a
n
d
notes
.
c: Re
o
rder functions in p
r
eparation for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h: Ma
k
e defaul
t
_notes_r
e
f() available
in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
(t
r
ivial) not
e
s
.
h
: Minor
do
c
umentation fixes to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
no
t
es
.
c: Hexi
f
y SHA1 in die() message fr
o
m i
n
it_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herl
a
n
d
notes: Don't create (empty) commit when remo
v
i
n
g
non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
J
ohan
H
erl
a
nd
Enable
c
ustom sche
m
es for column colors in the g
r
ap
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make
graph_n
e
xt_line() available in
t
he graph
.
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herlan
d
revision: Tur
n
off history
s
implif
i
cation in --ance
s
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
rev
i
sion: Fix
typo
i
n
-
-ancestry
-
p
a
th error
m
essage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentatio
n
/rev-
l
ist-options
.
tx
t
:
Explain
-
-
ance
s
try
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docume
n
tatio
n
/
r
e
v-list-options
.
txt
:
F
ix missing li
n
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan He
r
land
d
iff
.
c: Ensur
e
"index $from
.
.
$to" line co
n
tai
n
s
unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han
Herland
built
i
n-
n
otes:
M
in
o
r (mo
s
tly parse_o
p
tions-rela
t
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodul
e
summary: Don
'
t barf w
h
en invoked i
n
a
n
empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
builtin-notes: Add "
c
opy" s
u
bc
o
mmand for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rla
n
d
bui
l
tin-
n
ot
e
s: Misc
.
refactoring
of argc and
exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-no
t
es: A
d
d -c/-C options
f
o
r r
e
using notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herlan
d
bui
l
tin-notes: Refactor handling o
f
-F option to
all
o
w
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
bu
i
ltin-note
s
: Deprecate the
-
m/-F options for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes: Add "append" subcomm
a
nd for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
l
a
nd
built
i
n-notes: Add "add" s
u
b
command fo
r
a
d
d
in
g
n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
buil
t
in-n
o
tes: Add --message/-
-
file
a
liases for -
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes: A
d
d "list" subcomm
a
nd for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
Docum
e
n
t
ation
:
Gener
a
lize git-notes docs
t
o
'
objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
builtin-notes: Add
"
prun
e
" s
u
bcommand for
r
emoving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
t
es
API: pr
u
ne_notes(): Prune
note
s
that belo
n
g
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
3
05:
V
erify th
a
t removing no
t
es tr
i
ggers
a
utomatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
e
r
land
b
u
i
ltin-not
e
s: Add "remove" subcommand for
r
emo
v
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Teach
b
uil
t
in-notes to
rem
o
ve
e
mpty
n
ot
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Teach notes code t
o
properly prese
r
ve non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
t3305: Veri
f
y t
h
at adding many notes w
i
th git
-
note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3301: V
e
r
ify successful
ann
o
t
ation of non-comm
i
t
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Bui
l
tin-ify git-n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Refactor notes c
o
nc
a
tenation into a flexibl
e
interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next