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
Merge branch 'jk/maint-mv' into maint
2011-11-29
J
o
ha
n
Her
l
a
n
d
f
ast-
i
mport: Fix
i
ncorrect fanout lev
e
l when
modif
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Her
l
an
d
t9301: Add 2n
d
testcase exposing
bug
s
in fast-im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
t9301: Fix
t
e
s
tcase covering up
a bug in fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400:
F
i
x
a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Her
l
and
Mark dirstat error messages
f
o
r translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
and
Improve e
r
ror hand
l
in
g
wh
e
n
parsing di
r
s
t
at parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n
Herl
a
n
d
New -
-
dirstat=li
n
e
s mode, doing dirstat anal
y
sis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specifyin
g
-
-
dirstat c
u
t-off p
e
rcentage as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config var
i
abl
e
f
o
r specifying default --dirsta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor --dir
s
tat parsin
g
; deprecate --c
u
mulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make -
-
d
i
rst
a
t
=0 output directori
e
s
that contrib
u
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han He
r
land
Add several testcas
e
s for --dirsta
t
an
d
fr
i
ends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
ohan Herland
--dirstat:
In case of rena
m
es, use targe
t
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herla
n
d
Teach -
-
dirstat not t
o
c
o
m
pl
e
tely
igno
r
e re
a
rranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dir
s
tat-
b
y-
f
ile: Ma
k
e
i
t
faster
a
nd
m
o
r
e correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n
Herlan
d
-
-dirs
t
a
t
: Describe n
o
n-obvi
o
us difference
s
r
elativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
Make "g
i
t n
o
tes
add" more u
s
er-
f
riendly w
h
e
n
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herl
a
nd
l
o
g
/
pretty
-
o
p
t
i
o
ns:
Document --
[
n
o-]notes an
d
depr
e
cate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joh
a
n Herland
branc
h
/checkout -
-
tr
a
ck
:
Ensure th
a
t upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan H
e
r
land
p
u
sh
.
de
f
ault: Rena
m
e 'tracking'
t
o 'upstream
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
Provide 'git merge
--abort' as a synony
m
t
o
'git r
e
set
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
cmd_merg
e
(): Parse options before checking MERG
E
_
HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
Provi
d
e 'git
not
e
s
get
-
ref' to eas
i
ly retr
i
eve
c
urrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
git notes
m
er
g
e:
Add t
e
stcases for merging notes
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
g
it
n
otes mer
g
e: Ad
d
another auto-
r
e
s
olving
s
trate
g
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge
:
--commit should fai
l
if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t note
s
me
r
ge: Lis
t
conf
l
icting
n
otes in
notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: M
a
nual
c
onf
l
ict resol
u
tion, part
2/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manual con
f
lic
t
r
e
solution,
p
a
rt 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docu
m
entatio
n
: Prelim
i
nary do
c
s
on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
i
t not
e
s merge
:
Add automatic
c
onfl
i
c
t
resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: Handle real, non-c
o
nflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
builtin/notes
.
c
:
Refacto
r
creation of notes co
m
mits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
and
git notes m
e
rge:
Init
i
al impleme
n
tati
o
n ha
n
dl
i
ng
t
rivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rland
builti
n
/notes
.
c:
S
plit notes ref DWIMmery into a se
p
arate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
notes
.
c: Use two newlines (
i
nstead of one) when
c
onc
a
tenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
(
trivial) t3303: Indent with tabs i
n
stead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Propagate
c
om
b
ine_not
e
s_fn re
t
urn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
n
d
not
e
s
.
h/c: Allow combine_notes f
u
n
c
ti
o
ns
t
o rem
o
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c
:
Reo
r
de
r
fu
n
c
t
i
o
ns in prep
a
rat
i
o
n
for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
note
s
.
h:
Make d
e
fa
u
lt_notes_ref() avai
l
able in notes
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
(trivial) notes
.
h: Minor
d
ocumentation
f
i
x
es to copy_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erla
n
d
notes
.
c: Hexify SHA1 in die() m
e
ssage from ini
t
_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes:
D
on't create
(empty) commit w
h
en removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
ha
n
Herland
Ena
b
l
e
custom schemes for c
o
lumn col
o
rs in the gr
a
ph
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Make gra
p
h_next_l
i
ne() ava
i
lable
i
n
t
he graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
rev
i
si
o
n: Turn off history
s
i
m
pli
f
ication in --a
n
ce
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n
H
erland
revision: Fix typo in --ancestry-path erro
r
message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
rland
Document
a
tio
n
/rev-list-options
.
txt:
Explain --an
c
e
s
t
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
Docu
m
e
ntat
i
o
n
/rev-list
-
optio
n
s
.
txt: Fix m
i
ssing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
rland
d
i
f
f
.
c: Ensure "index $
f
rom
.
.
$to"
l
i
n
e contains unamb
i
guous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builti
n
-notes: Minor (most
l
y p
a
rse_optio
n
s-rela
t
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
su
b
m
o
dule sum
m
ary:
D
on't barf when
i
n
vok
e
d in an emp
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes: Add "copy" subcommand for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
bu
i
ltin-not
e
s
:
M
i
sc
.
refacto
r
ing of argc and ex
i
t value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
builti
n
-notes: A
d
d -c
/
-
C
options for
r
eusi
n
g no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
b
u
iltin-notes:
R
efacto
r
h
a
ndling of -F
o
ption to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
b
u
il
t
in-notes
:
Depre
c
a
t
e
t
h
e
-m/-F options f
o
r "g
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
bu
i
ltin-notes: Add "append" subcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
bu
i
ltin-notes: Add
"add" sub
c
ommand f
o
r adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add --message/-
-
fil
e
a
lia
s
es for
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
buil
t
in-no
t
es: Add "li
s
t
"
subcomm
a
nd
f
or li
s
ting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Documentation
:
G
e
ner
a
l
i
ze git-
n
otes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: A
d
d "prun
e
"
subcommand for re
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es API:
p
rune_notes(): Prune notes that belo
n
g
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t
3305: Ve
r
ify that removing note
s
t
r
i
ggers aut
o
m
atic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd "re
m
ov
e
"
subco
m
man
d
for removi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Teach b
u
ilt
i
n-notes to rem
o
ve empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
Tea
c
h not
e
s code to properly
preserve non-note
s
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify that
a
dding ma
n
y
notes
with git-not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t330
1
: Veri
f
y successful
a
nnotation
o
f non-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builti
n
-i
f
y gi
t
-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor notes concat
e
nation int
o
a
fle
x
ible in
t
erface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Notes API: Allow multiple co
n
cu
r
rent notes
tree
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
N
o
te
s
AP
I
: writ
e
_notes_tree()
:
S
tore
th
e
not
e
s tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rla
n
d
Notes API: for_each_no
t
e(): T
r
averse
t
h
e e
n
tire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_
n
ote(): Return th
e
not
e
a
n
notating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API: remove_note(): R
e
m
o
v
e note ob
j
e
c
ts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API: add_note()
:
A
dd note ob
j
ec
t
s
t
o the in
t
e
r
n
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herlan
d
Notes API: init_no
t
es():
I
nitialize the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
Add test
s
for chec
k
ing correct handling of
$
GIT_NOTE
S
_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes
AP
I
: get_c
o
mmit_no
t
es() -> form
a
t_note() +
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Minor cosmeti
c
fixes t
o
notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
o
h
an
Herland
b
u
iltin-config: Fix c
r
ash when using
"-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
Herland
A
dd more testcases to test fast-
i
mport
o
f notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
Rename t9301 to t
9
350, to
m
ake roo
m
fo
r
m
ore
fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herland
fas
t
-
i
mpor
t
:
Prop
e
r
not
e
s
tree mani
p
ulat
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n Her
l
a
n
d
F
i
x
c
r
a
s
her on
e
ncountering SHA1-like non-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herl
a
nd
Basi
c
buil
d
infrastruc
t
u
r
e for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an H
e
r
land
A
d
d self
t
ests verifying concate
n
atio
n
of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Refa
c
tor notes code to
c
onc
a
te
n
ate
m
ultiple
n
otes annotati
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add selftests veri
f
ying that we
c
an
p
a
r
se note
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n H
e
rland
Te
a
c
h
the notes lookup code t
o
p
arse
n
otes trees
w
ith
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Teach not
e
s code to
f
ree its internal data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
r
land
Add flags to get_comm
i
t_notes() to control th
e
form
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
r
land
t3302
-
notes
-
inde
x
-
e
xpe
n
sive:
Speed
u
p crea
t
e_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
fa
s
t-i
m
por
t
:
Add support fo
r
importing
c
o
mmit not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Teac
h
"-m <msg>" and
"-F <file>" t
o
"git notes e
d
it"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clone: A
d
d --
r
ecurs
i
v
e
to au
t
omatically chec
k
o
ut
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t7407: Use
'
re
v
-
pars
e
--short' rath
e
r t
h
an bash's su
b
string
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next