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(1): remove a defunct link to "list of authors"
2012-10-21
J
o
han H
e
rland
Fix fa
i
lure t
o
delete a packed re
f
t
h
rough a symre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan
H
er
l
and
t1400-update-ref
:
Add test
v
erifying bug with symref
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
ha
n
Herland
no
t
es-me
r
g
e: Don't re
m
ov
e
.
git/NOTES_MER
G
E_
W
ORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
erlan
d
notes-
m
erge: u
s
e
op
e
n
d
ir/readdir instead of using r
e
ad_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herland
t3310: illu
s
trate failure t
o
"notes merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
n
d
fa
s
t-import:
F
ix incorrect fanout level when m
o
difying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Her
l
and
t
9301: Add 2nd testca
s
e exposing bugs in f
a
st-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
t9301
:
Fix test
c
as
e
covering up a bug in
f
ast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rland
t
5400: F
i
x
a couple
o
f
t
ypos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan He
r
land
Mark dirstat e
r
ror messages
f
or tran
s
latio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
Improve error hand
l
ing when pa
r
sing d
i
rstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oha
n
Herland
New --dirs
t
a
t
=lines mode, doing d
i
rstat analy
s
is based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
All
o
w specifying --dirstat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
config variable for specifyin
g
default
--d
i
rstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Refactor --dirstat pa
r
s
ing;
d
e
p
r
e
cate
-
-cumul
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make --
d
irstat=0 output direc
t
o
r
ies that contrib
u
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Add sev
e
ral testcases for
--
d
irsta
t
and
frien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
a
n Herland
--dirstat: In case of renames, use target f
i
lename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
Teac
h
--d
i
rsta
t
n
ot to completel
y
ignore r
e
a
r
rang
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herl
a
nd
--dir
s
tat-by-
f
i
le: Make it
fas
t
er and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
dirstat: Describe n
o
n-obv
i
o
u
s diff
e
rences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
e
r
land
Make "git notes add" more use
r
-frien
d
ly when the
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herl
a
n
d
log/pr
e
t
t
y-opti
o
ns: Document
--[no-
]
n
o
t
e
s and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
er
l
and
b
ranch/checko
u
t --trac
k
: Ensure that
u
pstream
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
pu
s
h
.
defaul
t
: Ren
a
me 'tracking'
t
o 'u
p
s
tream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n H
e
rlan
d
Provid
e
'
g
it merge
--abort' 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
_
merge(): Par
s
e options before c
h
ec
k
ing ME
R
GE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Pro
v
ide '
g
it
notes get-ref' to ea
s
i
l
y
ret
r
iev
e
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herla
n
d
git notes merge: Add te
s
tcases for
m
e
rgi
n
g note
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
no
t
es merge: Add another au
t
o-resolving st
r
ategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git n
o
tes merge: --commit should fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge: List
c
onflicting not
e
s
i
n
note
s
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merge: Manual conflict resolu
t
i
on, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
r
l
and
git notes merge: Manual confli
c
t resolution, part
1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Documentation: Prelimi
n
ary
docs on 'git
note
s
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merg
e
: Add automatic confli
c
t
r
esolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Handle real, no
n
-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
e
r
land
bui
l
t
in/notes
.
c: R
e
f
a
ctor c
r
e
a
tion
o
f notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes mer
g
e: Initial implementation
h
andling trivia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
land
builti
n
/n
o
tes
.
c
:
Sp
l
i
t
notes ref
D
WIMmery into a se
p
arate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use two new
l
ines (instead of one) when
conc
a
tenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
(trivial
)
t33
0
3
:
Inde
n
t wi
t
h
t
abs in
s
tead o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
H
erla
n
d
n
otes
.
h/c
:
Propagate combine_notes_fn retur
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
h/c: Allow c
o
mbin
e
_
n
otes f
u
n
c
tions to rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c:
Reor
d
er
f
un
c
t
i
ons in
p
reparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
h: Ma
k
e default_notes_r
e
f() avail
a
ble in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rla
n
d
(trivial) notes
.
h: M
i
n
o
r d
o
cument
a
tion fixes to copy_note
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
n
otes
.
c
:
Hexify SH
A
1
in die(
)
messa
g
e from init_n
o
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herlan
d
not
e
s:
D
on't
c
reate (em
p
ty) c
o
mmi
t
when
r
emo
v
ing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custo
m
s
c
hemes for column colors in the g
r
aph
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
erland
Make graph_next_line() available i
n
t
h
e
graph
.
h
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an
H
e
rl
a
nd
revision: Turn off hist
o
ry sim
p
lif
i
cat
i
on i
n
--ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
revision
:
F
i
x
typo
in --
a
ncestry-pa
t
h
error messag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev-l
i
st-
o
ptions
.
txt: Expla
i
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documen
t
a
t
i
on/re
v
-list
-
options
.
txt: Fix missi
n
g line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
rland
d
i
ff
.
c:
E
n
sure
"in
d
ex $from
.
.
$to" l
i
ne contains unam
b
iguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Her
l
and
builti
n
-notes: Min
o
r (mostly parse_options-re
l
ated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an
Herl
a
n
d
submodule
s
ummary
:
Don
'
t ba
r
f wh
e
n
invo
k
ed in an
e
m
pty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: Add "copy" subco
m
mand for co
p
ying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
builtin-notes
:
Misc
.
refact
o
r
i
ng
of argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
an
d
bu
i
ltin-note
s
:
Add -c/-C
o
ptions for reu
s
ing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-note
s
: Refacto
r
han
d
li
n
g o
f
-F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-not
e
s:
D
eprec
a
te
the -m/-F
opti
o
ns fo
r
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
b
u
iltin-n
o
t
e
s: Add "append
"
subcommand
f
or appen
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
u
iltin-not
e
s:
A
dd
"a
d
d" sub
c
ommand for ad
d
in
g
note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-
n
ot
e
s
: A
d
d -
-
m
e
ssa
g
e
/
--f
i
le aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes: Add "list" su
b
command fo
r
list
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
Documentation: Ge
n
eralize git-
n
ote
s
d
o
c
s to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builti
n
-notes: Add
"prune" subcommand for removin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: prune_note
s
(
): Pru
n
e n
o
tes
t
hat belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verif
y
that removing notes trigge
r
s automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes: Add
"r
e
mo
v
e"
s
ubcommand f
o
r removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
T
eac
h
builti
n
-notes to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Teach note
s
code to properl
y
pre
s
erve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3305: V
e
rify tha
t
adding
many no
t
es with
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
a
n
d
t3301: Veri
f
y su
c
ce
s
sful annotation of
n
o
n-co
m
mits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Built
i
n-i
f
y
git-no
t
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Refactor not
e
s concatenation into a
flex
i
bl
e
in
t
erface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
Notes API: All
o
w multiple concurrent notes
t
r
ees w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Her
l
and
No
t
es API: writ
e
_no
t
e
s
_tree(): Store t
h
e
n
otes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: for_e
a
ch_note
(
)
:
Traverse the entire
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
Notes A
P
I:
g
et_note(): Retur
n
t
he
n
ot
e
annot
a
ting the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I:
r
e
m
ove_note(): Rem
o
ve note objects
f
rom
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes AP
I
: add_note()
:
Add n
o
t
e
objects to
the
i
ntern
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
l
and
N
o
t
e
s
API: init_notes(): Initializ
e
the
no
t
es
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
A
d
d
tests for checking co
r
rect
h
andling o
f
$GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API:
g
et_c
o
mm
i
t_notes(
)
-> format_note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Min
o
r cosmetic
fixes to no
t
e
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an Herland
bui
l
tin-config: Fix cr
a
sh when us
i
ng "-
f
<rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
h
a
n
Herla
n
d
Add more tes
t
c
a
s
e
s to tes
t
fast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an
H
erland
Rename
t
93
0
1
to t9350
,
to make room
for
m
o
re fast-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
ha
n
H
erl
a
nd
fast-import: P
r
oper notes tree manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Her
l
and
Fix crasher
on e
n
c
o
untering S
H
A1-like no
n
-note i
n
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan
Herland
B
asic b
u
ild inf
r
astr
u
cture for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
A
d
d selftests v
e
rifying
c
oncatenation
o
f multipl
e
no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Refac
t
or notes code to concatenate
m
ult
i
ple
not
e
s annotatin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
Add selftest
s
verifying tha
t
we can parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teac
h
the note
s
lookup code to parse notes
t
rees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
He
r
land
Te
a
ch notes code to free it
s
i
n
ternal
d
a
ta st
r
uctures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add
f
l
ags to get_commit_notes() to
c
ontrol t
h
e format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next