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 symbolic-ref --delete $symref
2012-10-21
Johan
H
e
r
l
a
nd
git sym
b
oli
c
-ref --delet
e
$symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Herla
n
d
notes-mer
g
e: Don't remove
.
git/NOT
E
S_MERG
E
_WORKT
R
EE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: u
s
e opendir/readdi
r
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
J
o
h
an Herland
t3310:
i
llus
t
rate failure to
"notes
merge
--commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast-
i
mpor
t
: Fix
i
n
corr
e
ct fanout level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add
2n
d
t
es
t
c
a
s
e
exposing bugs
in fast-imp
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
t9301:
F
i
x
t
e
s
tca
s
e cov
e
ring up a bug in f
a
st-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n Herland
t5400:
F
ix a
c
ouple of
t
yp
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Mark di
r
stat e
r
ror message
s
f
o
r
t
ranslation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Improve err
o
r
handling when par
s
ing dir
s
tat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
New --dirstat=lines mode, d
o
ing
d
irstat an
a
lys
i
s
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Allow specif
y
i
n
g --
d
irstat cut-off percen
t
age as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
d
d config
v
a
r
iable for specifying
d
efaul
t
--d
i
rstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Refactor --dirstat parsin
g
; depre
c
ate -
-
c
u
mulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Make
--dirs
t
at=0 output direct
o
ries that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n
H
erland
A
d
d several
t
estc
a
ses for --dirs
t
at and
f
r
iends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herlan
d
--d
i
rstat: In case of re
n
ames, use target f
i
lename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
h
an Herland
Teach
-
-
dirsta
t
no
t
to compl
e
t
e
ly ig
n
ore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
h
an Herland
--dirstat
-
by-file: Make it fast
e
r and more co
r
rect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--dirstat:
D
escri
b
e non-ob
v
ious differe
n
ces relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
Make "git n
o
t
e
s
a
dd" m
o
re
user-friendly when
t
here
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
log/pretty-options: D
o
cument --
[
no-]no
t
es and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
Herland
b
r
a
nch
/
checkout --track:
Ensure that upstream bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Jo
h
an Her
l
and
push
.
default
:
Rename 'trac
k
ing'
t
o
'
u
ps
t
ream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
P
rovide
'g
i
t merge --abort
'
as a
synony
m
to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merg
e
(): Parse
options
b
e
fo
r
e
checking MERGE_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Prov
i
de 'git notes ge
t
-
r
ef' to
e
a
s
i
ly retr
i
eve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
git n
o
tes me
r
ge: Add testcases for m
e
r
g
ing notes
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
git notes m
e
rge:
Add
a
nother au
t
o-resolving
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes
m
erge: --c
o
m
mit s
h
oul
d
fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
me
r
ge
:
List conflict
i
ng notes in
notes m
e
r
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
g
i
t notes merge: Manual conflict 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
c
onflict resolution, part
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
Do
c
umentat
i
on: Preliminary d
o
cs on
'git
n
ot
e
s
m
erge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
t
es merge: Add automatic conflict
resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erland
git no
t
es merge
:
Handle rea
l
,
n
o
n-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
builtin
/
notes
.
c: Re
f
actor creation of n
o
tes co
m
mits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes merge
:
Initi
a
l implementation handling tri
v
ia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
buil
t
in/notes
.
c
: Spli
t
notes ref DWIMme
r
y into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
nd
notes
.
c: Use two newlines (instead of one) wh
e
n
conc
a
ten
a
ti
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
l
a
n
d
(
t
rivial) t
3
303:
Indent with tabs i
n
stead of sp
a
c
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
n
ot
e
s
.
h/c: Propagate comb
i
ne_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
h/c:
Allow combine_notes
f
u
ncti
o
ns to
r
e
mov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
n
d
n
ote
s
.
c
:
R
eorder functions in
p
rep
a
rati
o
n for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h
:
Make
d
e
f
ault
_
notes_ref()
a
vailable in
note
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
(trivi
a
l) notes
.
h:
M
ino
r
d
ocum
e
n
t
ation fi
x
es to
c
opy_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c: H
e
xify SHA1 i
n
d
i
e() m
e
ssage
f
rom init_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herlan
d
n
o
tes: Don't create (empty
)
c
o
mmit when rem
o
ving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
En
a
b
l
e custom sch
e
m
e
s for column colors in
t
he
graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
n
d
Mak
e
graph
_
next_line() available in t
h
e
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han He
r
la
n
d
revision:
T
u
rn off history simplifica
t
ion in --ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
revision
:
F
ix typo in --ancest
r
y-p
a
th er
r
o
r
message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
an Her
l
a
nd
Do
c
ume
n
t
ation/re
v
-
l
ist
-
opti
o
ns
.
txt: Explain --anc
e
str
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
Documentation/rev
-
li
s
t-op
t
ions
.
txt: Fix missi
n
g lin
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensur
e
"in
d
ex $from
.
.
$to" line con
t
ains unambiguo
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an Herland
bui
l
t
in-notes: Mi
n
or (
m
ostly p
a
rse
_
o
p
t
i
ons-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Her
l
and
submodule
s
umm
a
ry:
D
o
n't
b
arf when invoke
d
in
an emp
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Ad
d
"copy" sub
c
om
m
and
f
or
copyi
n
g
not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
uilti
n
-no
t
es: Misc
.
re
f
actoring of argc an
d
exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
buil
t
in-notes:
Add -c/-C o
p
t
i
ons fo
r
reu
s
ing n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-n
o
tes:
Refactor handlin
g
of -F opt
i
on
t
o allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Dep
r
ecate the -m/-F options fo
r
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
b
u
i
l
tin-notes: A
d
d "append" subc
o
mmand
for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
buil
t
i
n
-n
o
t
es: Add "add
"
subcom
m
and
f
o
r adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
u
i
ltin-notes: Add --
m
essage/--file aliases fo
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herlan
d
builtin-notes: Add "l
i
st" subcom
m
and for listi
n
g
note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
D
o
c
umentation: G
e
neraliz
e
git-no
t
es docs to '
o
bj
e
cts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
builtin-notes: Add "p
r
une" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herl
a
nd
Notes API:
p
rune_not
e
s
(
): Prune no
t
e
s that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
t3305: Ve
r
ify
t
hat
r
emoving notes triggers
a
utomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
builtin-notes: Add "remov
e
" s
u
bcommand for
r
emov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
Teach buil
t
in-
n
otes
to rem
o
ve empty
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Teach notes code to properly preserve non-
n
otes i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
05:
Verify that adding man
y
not
e
s
w
ith git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
t
33
0
1
:
Ve
r
ify successful annot
a
tion of non-com
m
i
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Builtin-ify
gi
t
-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
er
l
and
Refactor n
o
tes c
o
ncatenation into a fl
e
xible
interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
N
otes API: Allo
w
m
u
ltip
l
e con
c
ur
r
ent n
o
t
es trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API
:
w
rite_notes_
t
ree(): S
t
ore the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
o
t
es API: for
_
each_n
o
te(): Traverse t
h
e entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_note(): R
e
turn
t
he no
t
e
anno
t
ati
n
g
t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
N
otes API: remove_no
t
e(
)
: Remove n
o
t
e
ob
j
ects
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: add_note(): Add n
o
t
e obje
c
ts to the
i
ntern
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
N
o
tes AP
I
:
init_no
t
es(): Init
i
aliz
e
t
he notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Add tests for checki
n
g correct h
a
ndling of $GIT_NOTE
S
_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get
_
co
m
m
i
t_notes() -> format_note() +
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Mi
n
or cos
m
e
tic
f
i
x
es
t
o not
e
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
built
i
n-config: Fix c
r
ash when using "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add more testca
s
es t
o
t
est f
a
st-import of
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
Her
l
a
nd
Rename t9301 to t9350, to make room for more
f
ast-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan He
r
l
and
fast-impor
t
:
Proper notes tree manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix cras
h
er on
e
ncountering SH
A
1-like non-note in
n
o
te
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Her
l
and
Basic build infrastructu
r
e for Pyt
h
o
n scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
A
dd selftests verifying concatenation of mul
t
iple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
a
n Her
l
and
R
e
fac
t
or notes
code to concatenate mu
l
tiple notes a
n
notating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Add selftests veri
f
ying tha
t
we c
a
n parse notes
tre
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
He
r
land
Teach the notes lookup code to parse n
o
tes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
ea
c
h n
o
tes code to
f
ree its
i
nt
e
rnal da
t
a structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add fla
g
s to get_commit_notes(
)
to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herlan
d
t3302
-
notes-index-expensive: Speed up c
r
eate_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next