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-svn: (cleanup) remove editor param passing
2014-04-19
J
o
han
H
erland
Git 2
.
0: git s
v
n
: Set defau
l
t --pr
e
fix='origin/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Johan Herl
a
nd
notes: disallow reusing non-
b
lob as a no
t
e objec
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Jo
h
an
H
erland
sha1_file
.
c
:c
r
eate_tmpfile(): Fix race whe
n
creating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Joh
a
n Herland
git-s
v
n: Warn
about
c
han
g
i
n
g d
e
faul
t
for --prefix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herla
n
d
D
o
cu
m
ent
a
tion/git-svn: Pro
m
ote th
e
use
of --pre
f
ix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Jo
h
an H
e
rland
sample pre-comm
i
t hoo
k
: u
s
e
-
-bool w
h
en retrie
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herland
t3200: Add test dem
o
nst
r
ating
mi
n
or
r
egression in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Herland
Refer
to
b
ran
c
h
.
<name>
.
r
e
m
ote/merge when
doc
u
me
n
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t
3
200: Minor fix whe
n
preparing for tra
c
king
f
a
ilure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n
H
e
rland
t2024: Fix &&-ch
a
ining and a couple of
typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
han
Herland
Move crea
t
e_notes
_
commi
t
() from notes-mer
g
e
.
c
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an Herla
n
d
Move copy_note_f
o
r_
r
ewrite + friends from builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
l
a
nd
fin
i
sh_copy
_
no
t
e
s
_for_rewrite(): Le
t
calle
r
prov
i
d
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
glossary: Update and rephras
e
t
h
e definit
i
on of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
r
land
branc
h
.
c
:
Validate tracki
n
g bran
c
h
es with re
f
spe
c
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t9114
.
2: Don't use
--track o
p
tion again
s
t "
s
vn-rem
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herl
a
nd
t72
0
1
.
24: Add refspec
to kee
p
--track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herl
a
nd
t3
2
0
0
.
39:
tr
a
cking setup shoul
d
fail i
f
the
r
e is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
checkou
t
: Use remote refspecs when DW
I
Mmi
n
g tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t2024: S
h
ow failur
e
to use refspec when
DWIMming r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Add tests ver
i
fying current
DWIM behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git
s
y
mbolic-ref --dele
t
e $
s
ymref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rland
F
i
x
f
ailure to
delete
a
pa
c
ked
r
ef through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
er
l
and
t1400-
u
pdate-ref: A
d
d t
e
st
verifyi
n
g b
u
g with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
not
e
s-merge:
D
on
'
t remove
.
git/
N
OTES_MERGE_WO
R
K
T
REE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Her
l
and
notes-me
r
ge:
u
s
e
open
d
ir/readdir inste
a
d of using r
e
ad_di
r
ec
.
.
.
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
: ill
u
strate failu
r
e to "notes
m
e
r
g
e --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan H
e
rland
f
ast-import: Fix
i
ncorrect
fanout level when mod
i
fy
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herland
t9301: Add 2nd test
c
ase exposing
b
u
g
s i
n
f
a
st-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
h
an Herland
t9301: Fix testcase covering up a b
u
g in
f
ast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
J
o
han Herland
t
5
400: Fix
a c
o
uple
o
f typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herla
n
d
Mark dirsta
t
error messages
f
o
r
t
rans
l
at
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve error
handling when parsing dirs
t
at parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
N
ew --
d
irstat=l
i
nes mo
d
e, doing dirstat analysis ba
s
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
H
e
r
l
and
A
l
low specifying --dirstat cut-off percentage
a
s
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Add
c
onfig variable for specifying defa
u
lt --
d
irs
t
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n Her
l
and
R
e
facto
r
--
d
irstat
parsin
g
; deprecate --cumul
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Make --dirstat=0
o
u
tpu
t
direct
o
r
i
es tha
t
contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
ha
n
Herland
Add
s
ever
a
l testcas
e
s for --
d
i
rstat and friend
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n He
r
l
and
--di
r
s
t
at: In case of renames
,
use target filena
m
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
Teach -
-
dirst
a
t no
t
to completely i
g
nor
e
r
ear
r
anged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rl
a
n
d
--dirs
t
at-by-fil
e
: Make it fast
e
r and
m
or
e
corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herla
n
d
--dirsta
t
: Describe
non-obvious diffe
r
enc
e
s
r
elati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Mak
e
"git notes add" more
u
s
er-friendl
y
when t
h
ere
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han H
e
rla
n
d
log/pretty-options: Document --[no-]
n
ot
e
s and de
p
recate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
He
r
land
branch/checko
u
t --track: Ens
u
re that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
ohan H
e
rla
n
d
p
ush
.
def
a
ul
t
: R
e
n
a
me 't
r
acking' to
'upstrea
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rland
Pro
v
ide 'git merge
--ab
o
rt' as a
s
y
n
onym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
cmd_mer
g
e(): Parse options before checking MERGE_HE
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Provide 'git notes
g
e
t
-ref'
t
o e
a
sily retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes me
r
ge:
A
dd testcas
e
s for m
e
rging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
land
git notes merge: Ad
d
another aut
o
-resolving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
gi
t
notes merge: --commit should f
a
i
l if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
Li
s
t conflict
i
n
g
notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes
m
erge
:
M
a
nua
l
conflict resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erg
e
: Manual
conflict resoluti
o
n, part
1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
Documentation: Preliminary docs on 'git notes merg
e
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add
automatic conflict reso
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
it
not
e
s
m
erge: Handle real, non
-
conf
l
i
c
ti
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c
: Refact
o
r creation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rland
git notes m
e
rge
:
Initial implement
a
tion han
d
l
i
n
g t
r
ivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin/not
e
s
.
c: Split notes ref DWIM
m
ery into a sep
a
ra
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herlan
d
notes
.
c: Use two
newl
i
nes (instead of o
n
e) w
h
en concat
e
natin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
(trivial) t3
3
03: In
d
ent w
i
th tabs ins
t
e
ad of spac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Pro
p
agat
e
comb
i
ne
_
notes_fn return
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c:
A
llow combi
n
e_
n
otes
funct
i
ons to
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
c: Reorder
f
unctions
in
p
reparat
i
o
n
f
or next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
n
ot
e
s
.
h:
M
ake defa
u
lt_no
t
es_re
f
()
available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan H
e
rla
n
d
(
t
rivial) n
o
tes
.
h: Minor docume
n
tation fixes t
o
c
opy_n
o
tes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
l
a
nd
notes
.
c
:
H
exify SHA1 in die() mes
s
age from init_
n
otes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
no
t
es: Don't create (empty) commit wh
e
n
r
emo
v
i
ng
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an
H
erlan
d
Enable custom schemes f
o
r colu
m
n colo
r
s
in the graph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rland
Make graph_n
e
xt_line() available in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revisi
o
n:
Tur
n
off h
i
story si
m
plif
i
ca
t
i
on in --a
n
cestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
rev
i
sio
n
: Fix typo in --ance
s
try-p
a
th
e
rror m
e
ssage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
D
o
c
umentation/rev-list-options
.
txt:
Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
Doc
u
mentation
/
rev-lis
t
-options
.
t
x
t: F
i
x missing li
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herland
di
f
f
.
c:
E
n
s
u
re "in
d
ex $fr
o
m
.
.
$to" line contai
n
s un
a
mbiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han Herland
b
u
iltin-notes: Minor (mostl
y
parse_opti
o
n
s-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
H
erland
s
u
bmodule summary: Don
'
t barf when invo
k
ed in
a
n empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
builtin-notes: Add "copy
"
subcomman
d
fo
r
co
p
ying note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
builtin-not
e
s: Misc
.
refactoring
o
f arg
c
and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-n
o
tes: Add -c/-
C
op
t
ions for reu
s
ing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes:
R
efacto
r
h
andling 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: D
e
precate the
-m/
-
F o
p
tions for
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
builtin-notes: Add "append" su
b
com
m
a
n
d for appe
n
di
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes
:
Add
"
add" subcommand for
adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-note
s
: Add -
-
messa
g
e/
-
-file aliases for
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes:
Add "list
"
subcomma
n
d for l
i
sting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
nd
Documenta
t
io
n
:
G
e
neralize git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes:
Add "prune" sub
c
ommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
N
o
t
e
s API: prune_notes(): Prune notes that belong
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
t3305: Verify tha
t
removing notes triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd "remove" subcommand fo
r
removin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
T
e
ach builtin-notes
to rem
o
ve
e
mpty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
T
e
a
ch notes code to properly pr
e
serve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t3305: V
e
rify
t
hat adding ma
n
y not
e
s
wit
h
gi
t
-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
t3301: Verify successful annot
a
t
ion of no
n
-
c
o
mmits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-
i
fy
g
it-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Refact
o
r notes
c
oncatenati
o
n
into a flexible interfac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next