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
Joha
n
Herland
Git
2
.
0
: git svn: S
e
t
defaul
t
--prefix
=
'origin/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Joha
n
Her
l
a
nd
notes: disall
o
w reusing non-blob as
a
note object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Johan He
r
l
and
sha1_file
.
c:create
_
t
m
pfile(): Fix race when crea
t
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Jo
h
an Herland
git-svn:
W
arn ab
o
ut
c
h
anging default for --prefix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
J
ohan H
e
rland
Documentation/git-svn: Promote t
h
e use o
f
-
-prefi
x
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
J
o
han
Herla
n
d
s
ample
p
re-commit hook: use
--bool when retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rl
a
nd
t3200: Add test demonstrating minor regres
s
ion in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herla
n
d
Refer
t
o
bran
c
h
.
<na
m
e>
.
rem
o
te/
m
e
r
ge
w
hen docume
n
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200:
Minor fix when p
r
eparing f
o
r tracking f
a
ilure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Her
l
and
t2024: Fix &&-
c
haining a
n
d a
couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
H
e
r
l
and
Move create_notes
_
commit() from n
o
tes-
m
erge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan H
e
rl
a
nd
Mov
e
c
o
p
y
_no
t
e_for_rewrite + friends
f
rom bu
i
ltin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
H
erland
f
inish_co
p
y_notes_fo
r
_rewrite(): Let call
e
r provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
glossary: Upda
t
e a
n
d rephrase
t
he definiti
o
n of a
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Validate tracking branch
e
s with refspe
c
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t
9
114
.
2
:
Don't use --track
o
ptio
n
against "svn-
r
emot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
7201
.
24
:
Add refspec to keep --track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herla
n
d
t3200
.
39: tracking setup sho
u
ld fail if the
r
e is
n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herlan
d
checkout: U
s
e remo
t
e re
f
s
p
ecs when DWI
M
ming tr
a
cking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n He
r
land
t202
4
: S
h
ow fa
i
lure to use refspec when DWIMmin
g
remot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t2024: Add tests veri
f
y
i
ng
cu
r
rent DWIM
b
ehavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herl
a
n
d
g
it symbolic-ref --d
e
l
ete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
Fix
f
ai
l
ur
e
t
o d
e
lete
a pac
k
ed ref thr
o
ugh a s
y
m
r
ef
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han He
r
land
t1400-update
-
r
e
f: Add test
verifying bug
w
ith
s
ymrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
notes-merge
:
Don't remove
.
git
/
N
O
TES_MER
G
E_WORKT
R
EE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an
H
e
rland
notes-mer
g
e: use open
d
ir
/
readdir ins
t
ead 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
J
o
han Herla
n
d
t3310: illustrate failure to "notes merg
e
--commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
fast
-
i
m
port: Fix incorrect
f
anout l
e
vel when mo
d
if
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
t9
3
0
1: Add 2
n
d test
c
a
s
e
exposing
bugs in fast-i
m
p
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t
9
301: Fix
testcase
c
over
i
n
g
up
a
bug in
f
a
st
-
im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an H
e
rland
t5400: Fix a co
u
ple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dirstat e
r
ror messages for
tran
s
la
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herlan
d
Imp
r
ove
e
r
r
or han
d
l
i
n
g when pa
r
sing dirstat
p
ar
a
me
t
er
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
New --di
r
stat=lines mode, doi
n
g
dirstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Al
l
ow specifyi
n
g --dirstat
c
ut-off percen
t
age as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
He
r
lan
d
A
d
d
c
onfig variable for
s
pecifying defa
u
lt --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Refactor --dirst
a
t
parsing; deprecat
e
--cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
r
land
M
a
ke --dirstat=0 outpu
t
d
irectories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herla
n
d
A
d
d several test
c
ases for --dirstat and f
r
i
ends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
H
erlan
d
--dirstat: In case of renames,
use ta
r
get filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herl
a
nd
Teach --dirsta
t
not to completely ign
o
re rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
--dirstat-by-file: Make it faster and more corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
-
-dirstat: De
s
cribe non-
o
b
v
ious differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n
He
r
l
a
nd
Make "gi
t
not
e
s add"
m
o
re
u
s
er-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log
/
pretty-options: Document --[no-]note
s
and de
p
r
e
c
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han
Herland
branch/checkout
--track: Ensure that
upstream bran
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
ohan Herland
push
.
defaul
t
: Rename 'tracking' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
P
rovid
e
'git merge --ab
o
rt' 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_me
r
ge(
)
:
P
arse options before
c
hecking M
E
RGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
P
r
ov
i
de 'git
n
otes
g
et
-
ref' to easily re
t
ri
e
ve
c
u
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
a
nd
git notes m
e
rge:
A
dd t
e
stc
a
ses
f
or merging
n
otes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes merge: Add
a
noth
e
r au
t
o
-
resolvin
g
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
r
l
and
git
n
o
t
es merge: --
c
omm
i
t should fa
i
l if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
a
nd
git notes
merge: L
i
st confl
i
cti
n
g
n
o
t
es in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge: Manua
l
conf
l
ict resoluti
o
n, pa
r
t 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git
n
otes merge:
Manual confl
i
ct re
s
oluti
o
n
,
p
a
rt 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
H
erland
Documentati
o
n
: Preliminary docs on 'git note
s
mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git no
t
es merg
e
:
Add automatic
conflict re
s
olver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge: Handle r
e
al, non-conflicting
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herlan
d
builtin/
n
ot
e
s
.
c
: Refactor creatio
n
of n
o
tes
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
it
n
o
te
s
me
r
ge: Initial implem
e
n
t
at
i
on handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
builtin/no
t
es
.
c: Split
n
otes ref DWIMm
e
ry
i
n
to
a
s
e
parate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
notes
.
c:
U
se two ne
w
lines
(
instea
d
of
one) when co
n
catenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3
3
03: Ind
e
nt with tabs in
s
tead
of space
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
note
s
.
h/
c
: Propagate combin
e
_notes_fn re
t
urn val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
h/c: Allow combine
_
notes functions to
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c: Reorder
f
unctions in
p
repara
t
ion for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n H
e
rland
no
t
es
.
h:
Make default_notes_ref() available in
notes A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
(trivi
a
l) note
s
.
h: Mino
r
documenta
t
ion fixes to co
p
y_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c: Hexify SHA1 in die() message from ini
t
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: D
o
n
't cr
e
ate (empty)
commit w
h
en removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an
H
e
rland
Enable custom schemes
for colum
n
c
olors in th
e
graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Make
g
raph_next_lin
e
() availabl
e
in the
g
raph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
revision: Turn off history simplificat
i
on in --anc
e
stry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
r
evision: Fix typ
o
i
n --ances
t
ry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
ocumentatio
n
/
r
ev-list-options
.
tx
t
: Expla
i
n
-
-ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
D
o
cumentation/rev
-
l
ist-options
.
txt: Fix missin
g
l
i
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
an Herland
di
f
f
.
c
:
Ensure "index $from
.
.
$
to
"
line
c
ontains unam
b
iguo
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herl
a
nd
b
u
iltin-not
e
s: Min
o
r (mostly parse_op
t
ions-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
H
erland
submodule sum
m
ary: D
o
n't
b
ar
f
when i
n
voked i
n
an
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-
n
otes: Add "c
o
py"
s
u
bcommand fo
r
copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Misc
.
refact
o
ring of argc and
e
xit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
builtin-notes: Add -c/
-
C options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Refactor handling of
-F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
l
and
bu
i
ltin
-
notes: Dep
r
ecate the -m/-F options
f
or "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
H
erland
bu
i
ltin-notes: Add
"app
e
n
d
" sub
c
ommand for app
e
nd
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin
-
notes: Add "add" subc
o
mm
a
n
d
f
or adding
n
ot
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
e
rland
bu
i
ltin-n
o
tes:
A
d
d --mess
a
g
e/--
f
ile
aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan 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
Johan Herland
D
o
c
umen
t
ation: Generalize git-notes docs t
o
'
objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes:
A
dd "prune" subco
m
mand fo
r
re
m
ovin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Notes
A
P
I
: prun
e
_not
e
s(
)
: Prune
n
o
t
es tha
t
belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
t3305: Ver
i
fy that re
m
oving notes tr
i
ggers aut
o
mat
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
builtin-notes: Add "remove
"
s
ubcomma
n
d
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herla
n
d
Teach builtin-notes t
o
r
emo
v
e
e
mpty
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Teach notes code
t
o
pr
o
perly pr
e
serve
n
on-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t
3
305:
V
erify that adding many
n
ot
e
s with g
i
t-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3301: Verif
y
succe
s
s
fu
l
a
nnota
t
ion of non-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
B
u
iltin-
i
fy git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
r
l
and
Refa
c
t
or notes concate
n
ation into a fle
x
i
ble int
e
rface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next