repo.or.cz
/
git.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/send-email-sender-prompt'
2012-10-21
J
o
han
H
erland
git symbolic-re
f
--delete $
s
ymref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
lan
d
Fix f
a
ilu
r
e to delete a packed ref through a
s
ymref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-u
p
date-r
e
f: Add t
e
st verifying b
u
g with symre
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n Herland
note
s
-me
r
ge: D
o
n'
t
remov
e
.
g
i
t/NO
T
ES_MERGE_WORK
T
RE
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
H
e
rland
notes-
m
e
r
ge: u
s
e op
e
ndir/
r
e
addir instead of usi
n
g read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herla
n
d
t3310: illustrate
failure to "notes m
e
rge --c
o
mmit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
fast-import: Fix
i
n
c
or
r
ect fan
o
u
t lev
e
l
wh
e
n
m
odifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
He
r
land
t9301: Add 2nd
t
estcase exposing
b
ugs in fast-impo
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
t9301: Fix te
s
tca
s
e
cov
e
ring up a bug i
n
fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rland
t5400: Fix a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
Herland
Mark d
i
rstat error messages for translat
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herlan
d
Improve
error
h
a
n
dling when parsing dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
New --dirs
t
at=lin
e
s m
o
de, doing dir
s
ta
t
analysis ba
s
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specifyin
g
--
d
i
r
stat cut-off percentage
as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add c
o
nfig variable for s
p
ecifyi
n
g
default --dirst
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refac
t
or --dirs
t
a
t pa
r
sing; deprecate
--cumulativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ma
k
e -
-
dirst
a
t=0 out
p
ut directories
that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herlan
d
A
dd several test
c
ases for --dirst
a
t and frie
n
ds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: In case o
f
renames, use tar
g
e
t file
n
ame
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Te
a
ch --d
i
r
s
tat no
t
to complete
l
y
i
g
nore r
e
arranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
--d
i
rstat-by-file:
Mak
e
it faster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herl
a
nd
--dirstat: De
s
cribe non-obvious differences
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n H
e
rland
Make "git notes ad
d
"
more
user-frie
n
dly when
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han
H
e
rland
log/pretty-options: Docum
e
n
t
-
-
[no-]notes and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han He
r
land
branch/che
c
kout --tr
a
ck: Ens
u
re that upstream branc
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
d
e
fault: Rename 'tracking'
t
o
'upstream
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rland
Provid
e
'
git merge --abort' as a synonym to 'git
res
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
cmd_merge(
)
: Par
s
e options be
f
ore
c
h
e
cking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git notes get-ref' to easily
retriev
e
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: Ad
d
testcases for
m
erging note
s
tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge: A
d
d another au
t
o-res
o
l
ving st
r
a
tegy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: --commit sh
o
uld fail i
f
underl
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git n
o
t
e
s merge:
Li
s
t
con
f
li
c
ting
notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
r
land
git notes mer
g
e: Manual conflict
r
e
solution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
git notes merge
:
M
anual confli
c
t reso
l
ution, part 1/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Documentation: Prelimin
a
r
y
docs
on
'
git
n
o
tes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes
me
r
ge:
Add auto
m
atic co
n
f
l
ict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
git notes
merge: Hand
l
e real, no
n
-c
o
nfl
i
cting n
o
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/n
o
tes
.
c:
Refactor creation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
git
n
o
t
es m
e
rge:
I
nitia
l
implementation handling triv
i
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
b
u
i
l
tin/no
t
es
.
c
: Split no
t
es
r
ef DWIMmery into a
s
eparate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
notes
.
c: Use two ne
w
lines
(
i
nstead of
o
ne) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
(trivial
)
t3303: Indent with tabs
instead of s
p
aces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
tes
.
h/c: Propagate combi
n
e
_
n
o
tes_fn
return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow combine
_
notes
fun
c
tions to
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
oh
a
n Herl
a
n
d
n
o
tes
.
c
:
Reorder
f
u
nc
t
ions in preparat
i
on for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
lan
d
notes
.
h
:
Make d
e
faul
t
_not
e
s_ref() availa
b
le in notes
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
(tr
i
v
i
al) n
o
t
es
.
h: Minor documenta
t
i
on fix
e
s
t
o copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
t
e
s
.
c: Hexify SHA1 in die() mess
a
ge fro
m
init_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan H
e
rland
notes: Don't cre
a
te (empty) co
m
m
it when rem
o
vin
g
n
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Her
l
and
Enable
custom sc
h
e
mes for
c
olumn
c
olors in the gra
p
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
Ma
k
e graph
_
next_line(
)
a
v
a
ila
b
le in th
e
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
rland
revis
i
on
:
T
u
rn off h
i
story
simplification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
oha
n
He
r
la
n
d
rev
i
sion: Fix ty
p
o
in --a
n
cest
r
y-pat
h
err
o
r me
s
sage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
Documentation/rev-list-options
.
txt: Expl
a
i
n
--an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
Doc
u
m
ent
a
tion/r
e
v
-
l
ist-options
.
txt: Fix missing
line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
a
n Herla
n
d
di
f
f
.
c
:
Ens
u
re "index $from
.
.
$to
"
l
ine
contains unamb
i
guous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin
-
notes: Minor (mostly parse_
o
pti
o
n
s
-relat
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule s
u
mma
r
y: Don't barf
when invoked in an empt
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
uiltin-notes: Add "copy" subcomma
n
d for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin
-
notes:
Misc
.
ref
a
ctoring of
argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
a
nd
builtin-notes: Add -
c
/-C options f
o
r
r
eusing
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Her
l
a
n
d
builtin-no
t
es: R
e
fact
o
r handli
n
g of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
b
uiltin-notes: Deprecate the -m/-F opti
o
ns
for
"
git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
b
u
iltin
-
notes: Add
"append
"
subcomman
d
for app
e
nding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
bu
i
l
tin-n
o
t
e
s:
Add "add" subcommand for add
i
ng not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
builtin
-
n
otes: Add --mess
a
g
e
/
--file al
i
ases fo
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
b
uiltin-no
t
e
s
:
Add "list" subcom
m
and for li
s
ting
n
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Documentat
i
on
:
G
e
n
e
ra
l
ize
git-n
o
tes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
b
uiltin-notes:
A
dd
"
prune" subco
m
mand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
Note
s
API: prune_notes(): Prune notes th
a
t belon
g
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
t3305: Verify that
r
emoving not
e
s triggers a
u
tomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
bu
i
lt
i
n-
n
ote
s
: Add
"remove" sub
c
ommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach b
u
ilt
i
n-notes to remove
empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
notes
c
o
de to proper
l
y pr
e
serve non
-
notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t
33
0
5: Verify that addin
g
many no
t
es
with gi
t
-
n
ote
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify successful annotation of
n
o
n-com
m
i
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
Builtin-ify gi
t
-no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
R
e
fact
o
r notes co
n
catenation into a flexible
i
nter
f
ace
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
Notes API
:
Allo
w
multiple concurrent no
t
es tr
e
es w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
: writ
e
_notes_tree(): Store the notes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes API: for_each_no
t
e
():
Tr
a
ver
s
e
the ent
i
re notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
Notes API: get_note(): Retur
n
th
e
note
annotating t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
Notes
A
PI: remove_not
e
():
R
e
move note object
s
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
Note
s
API: add_
n
ote(): A
d
d note objects
to the
i
n
t
e
r
n
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes A
P
I: init_notes():
Initial
i
ze the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Add
tests for check
i
ng correct hand
l
in
g
of $
G
IT_N
O
TES_R
E
F
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
N
otes API: g
e
t
_commit_notes(
)
->
format_note()
+
r
e
mov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor co
s
metic fix
e
s
t
o notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan
H
erland
builti
n
-con
f
ig
:
Fix cra
s
h when using "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
a
n
Herland
Add mor
e
test
c
as
e
s
t
o test fast-i
m
p
o
rt of n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erland
Rename t9301 to t9350, to make
room for mo
r
e fas
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herl
a
nd
f
a
st-import: P
r
oper notes tree
m
a
nip
u
latio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan
Herla
n
d
Fix c
r
asher on encount
e
ring S
H
A
1
-like non-note in n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
B
a
si
c
build infrastru
c
tu
r
e for Python s
c
ripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
oha
n
Herland
A
dd
self
t
ests
verifying conc
a
tenation of
m
ult
i
ple
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
lan
d
Refactor notes
c
ode to concat
e
nate multiple notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
A
dd se
l
ft
e
sts verifying that we can
p
a
r
se notes
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Teach the n
o
tes
lookup
c
o
de t
o
parse n
o
tes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Te
a
ch
n
o
t
es code to free its inte
r
nal
dat
a
structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next