repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
combine-diff: handle binary files as binary
2011-05-13
Johan Her
l
and
t
5
4
0
0: Fix a couple o
f
ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dir
s
tat error mess
a
ge
s
for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
an
d
Improve error
handl
i
ng whe
n
parsing dirstat
p
arameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
New --d
i
rs
t
at=lines
m
ode, doing dirst
a
t analys
i
s base
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan H
e
r
l
and
Allow specifying
-
-
d
irsta
t
cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
H
erland
Add
c
onfi
g
variabl
e
for sp
e
cifying def
a
ult -
-
d
i
r
sta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Refac
t
or --dirsta
t
pars
i
ng; de
p
reca
t
e
--cumulat
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mak
e
--
d
irstat=
0
ou
t
p
ut d
i
rector
i
e
s t
h
at contrib
u
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Add
several testcases fo
r
--dirsta
t
and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
-
-
dirsta
t
:
I
n case of renames, use target fil
e
n
ame
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herlan
d
Te
a
ch --
d
i
r
sta
t
n
o
t to completely ign
o
re r
e
arranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by
-
f
i
le:
Make
i
t faster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--di
r
stat: Descri
b
e
non-obvious differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan H
e
r
l
and
Make "git notes add" mor
e
user-frien
d
ly when
ther
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan He
r
land
log/pretty-options: Docume
n
t --[no-]notes
and depr
e
c
a
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
H
e
rland
branch
/
checkout
--tra
c
k:
Ensure
t
hat upstrea
m
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Her
l
and
push
.
defau
l
t: R
e
na
m
e 'trac
k
ing' to 'upstre
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
Provide 'git
m
erge --abort
'
as
a
sy
n
on
y
m t
o
'
git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
and
cmd_merge
(
): P
a
rse options
before checking M
E
RGE
_
HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erla
n
d
Provide 'git notes get-re
f
' to
e
a
s
ily retrieve curre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
notes merge: Add te
s
tc
a
ses for merg
i
n
g
not
e
s trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes
me
r
g
e
: Ad
d
a
n
other auto-resol
v
ing strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
--
c
ommit should
f
ai
l
if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
merge: L
i
st conflicti
n
g
n
otes in n
o
tes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
g
it notes merge:
Manual conflict
resolu
t
ion, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
it notes merge: Manu
a
l con
f
l
i
ct resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
Docume
n
t
a
t
i
on: Preliminary docs
o
n
'git notes
m
e
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
not
e
s m
e
r
ge: Add auto
m
atic c
o
nflict resolv
e
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n H
e
rland
git
notes merge: Handle real, non-confli
c
ti
n
g no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
uiltin/notes
.
c
:
Refactor
creat
i
on of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git
notes merge: Initial implementation handling
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
builtin/notes
.
c
: Spl
i
t
n
o
t
es ref D
W
I
M
mery
i
nto a se
p
arate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
notes
.
c:
U
se two ne
w
lines (instead
of o
n
e) when
concat
e
natin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
(trivi
a
l)
t
3
3
03
:
Ind
e
nt with
t
abs instead of s
p
aces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
notes
.
h/c: Propagate c
o
mbine_notes_fn return v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
notes
.
h/c: Allo
w
com
b
ine_
n
o
t
es
func
t
i
ons to remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
n
o
tes
.
c: Reorder fun
c
tions in pr
e
paratio
n
for ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
n
d
notes
.
h: Make default_not
e
s_ref() availabl
e
in
notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herlan
d
(trivial
)
notes
.
h
:
Mi
n
o
r
documentation fi
x
es to copy_note
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
t
e
s
.
c
:
H
e
xify SHA1
in
d
ie()
m
essage from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n Herland
n
o
t
es: Don't cre
a
te (empty
)
commit
w
hen removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herlan
d
Enable custom schemes
f
or column colors
in the gr
a
ph
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Herland
M
a
ke g
r
aph_
n
ext
_
line() ava
i
lable in th
e
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herl
a
n
d
r
evision: Turn off history
s
implification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
r
evision
:
Fix typ
o
in --an
c
estry-pa
t
h
error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Document
a
t
ion/r
e
v-list-options
.
txt: E
x
plain
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docu
m
entation/rev-list-options
.
txt: Fix miss
i
ng line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Her
l
and
diff
.
c: Ensure "in
d
ex $from
.
.
$
t
o"
line c
o
n
ta
i
ns u
n
ambig
u
ou
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
H
erland
builtin-n
o
tes: Minor
(
mostly
p
arse
_
options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an
H
erlan
d
submodule sum
m
ary:
Don't barf when invoked in an
e
mpty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
e
r
land
builtin-
n
otes:
A
dd "cop
y
"
subcommand
f
or copyin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes: Misc
.
refac
t
orin
g
o
f
argc an
d
e
x
it value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
bui
l
ti
n
-note
s
: Add
-
c/-C options
for
reus
i
ng note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-not
e
s: Re
f
actor hand
l
ing of
-F option to al
l
ow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
bui
l
tin-notes: Deprec
a
te
t
he -m/-F optio
n
s for "
g
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an H
e
rland
built
i
n-notes: A
d
d
"ap
p
end" subcomman
d
for appe
n
ding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builti
n
-
n
o
tes: Add
"
add"
s
ubcommand for a
d
ding
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin
-
notes
:
Add --message/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
builtin
-
n
o
t
e
s
:
Add "l
i
st" subc
o
m
mand for
l
isti
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Documentat
i
on: Generalize git-
n
o
t
es
d
o
c
s
to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add "prune" s
u
bcommand f
o
r r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
N
o
t
e
s AP
I
: prune
_
notes(): Prune notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
t3305: Verify that remov
i
n
g
notes tr
i
ggers a
u
toma
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
builtin-
n
o
t
es: Add "r
e
move" subcommand for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
r
land
Teach bui
l
tin-
n
otes
t
o r
e
move
e
mpty
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
e
ach no
t
es code to pro
p
erly p
r
eserve
n
on-not
e
s in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
t
3
3
0
5
: Verify that
addi
n
g
m
any notes with gi
t
-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
t3
3
01: Verify succ
e
s
s
f
u
l annotation of non
-
commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
e
rland
Builti
n
-ify g
i
t-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
Refactor n
o
tes c
o
ncaten
a
tion into a f
l
exible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
Notes
A
PI: Allow multiple co
n
current
n
o
tes tre
e
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
N
o
tes A
P
I:
w
r
ite_notes_tree(): Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Note
s
A
PI: for_each_no
t
e(): Trav
e
rse the
enti
r
e no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
Notes A
P
I: g
e
t_note(
)
: Return the
n
ote annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Not
e
s
API: remove_not
e
():
R
emo
v
e note obj
e
cts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
Notes API:
add_note(): Add note
objects to the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
No
t
es API: init
_
notes(): Initializ
e
t
h
e
notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Ad
d
tests
for checking correct handlin
g
of
$
GI
T
_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
Notes API
:
get_com
m
it_notes() -> format_
n
ote() + remov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Minor co
s
m
etic fixes to note
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joh
a
n Herland
builtin-config: Fix crash when using "
-
f
<rela
t
iv
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
Ad
d
more test
c
a
s
es to test f
a
st-imp
o
rt of no
t
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Ren
a
m
e
t9301 to t935
0
, to
ma
k
e room
for more fa
s
t-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
Herland
fast-im
p
o
rt: Proper notes tree ma
n
i
p
ulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n Herland
Fix c
r
asher on encountering
S
H
A1
-
l
ike non-not
e
in no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Ba
s
ic b
u
ild infrastructure for Pyth
o
n
s
cri
p
ts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erlan
d
Add
s
e
l
f
tests ve
r
ifyin
g
concaten
a
t
ion
of m
u
ltiple n
o
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Re
f
actor not
e
s code to co
n
catenate multiple notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add self
t
e
s
t
s
ver
i
fying
that we can
parse note
s
tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Teach
t
he notes lookup code to par
s
e no
t
es
t
ree
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Teach notes code to free its inte
r
nal dat
a
structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han H
e
rland
Add flags t
o
get_commit_notes() to control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
r
land
t3
3
02
-
notes-ind
e
x-e
x
pensive:
S
peed up create
_
r
e
po()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
f
a
st-import: Add supp
o
rt for importing commit no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
each "-
m
<
msg>" and "
-
F <file>" to "git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan
H
erland
gi
t
clone
:
Add --recursive to
a
u
tomatically chec
k
out
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t
7
407: Use 'rev-
p
arse --sh
o
rt' r
a
ther than bash's substri
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
gi
t
su
b
m
o
dul
e
status: Ad
d
--recursive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git sub
m
odule u
p
da
t
e
: Int
r
oduce
-
-recurs
i
ve to update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herland
git submodule foreach: Add --recursive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next