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
Johan He
r
lan
d
git symbol
i
c-ref --delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
Fix fail
u
re
t
o dele
t
e a
p
acked ref through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-update-ref: Add test veri
f
ying bu
g
with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n Herla
n
d
notes-merge: Don't rem
o
v
e
.
git/NOTES_MERGE_WORKTRE
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
H
e
rla
n
d
notes
-
m
e
rge:
use ope
n
dir/readdir instea
d
of using read
_
d
irec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herlan
d
t3310: illu
s
trate failure to "notes merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
fast-import: Fix
incorrect fanout level when mo
d
ifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
a
n
d
t
9
301: A
d
d 2
n
d testc
a
se exposin
g
bugs
i
n fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
t9
3
0
1
:
F
i
x testcase covering
u
p
a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t
540
0
: Fix a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dirsta
t
error messages
f
or
t
ranslation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Im
p
rove err
o
r handling
w
hen p
a
rsing dirstat pa
r
ameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Her
l
and
N
e
w --dir
s
tat=lines mode, do
i
ng dirst
a
t analysis
bas
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow s
p
ecifying --dirsta
t
cut-of
f
perc
e
ntage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add c
o
nf
i
g va
r
iable for specifyin
g
de
f
a
u
lt --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
R
e
factor --di
r
stat pa
r
sing; de
p
r
ecate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
M
a
ke --dirstat=0 output directorie
s
that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
A
dd several
t
estc
a
ses for --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
ohan Her
l
and
--dir
s
ta
t
:
In
case of r
e
names, use target f
i
l
ename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach
--dirsta
t
not to comp
l
etely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
dirst
a
t-by
-
file: Make
i
t faste
r
and more cor
r
e
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
e
r
l
and
--dirst
a
t: Describe non-obvious differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "gi
t
notes
a
d
d" mo
r
e user-f
r
iendly when
t
h
ere
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
a
n
Herland
log/
p
retty
-
opt
i
ons: Do
c
ume
n
t
--
[
no-]n
o
tes and de
p
recate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Her
l
and
b
ranch/checko
u
t --tr
a
ck:
En
s
ure that upst
r
ea
m
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Her
l
and
p
ush
.
de
f
ault:
Renam
e
'tracki
n
g'
t
o
'
u
pstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
Provide 'git merge --ab
o
rt' as a synonym t
o
'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
r
l
and
c
m
d_merge(): Pa
r
se option
s
before ch
e
cking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Provid
e
'git notes get-re
f
'
to easily
r
etriev
e
cu
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
git notes
merge: Add tes
t
cases for m
e
rging notes
t
r
e
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes mer
g
e:
A
dd
a
nother auto-res
o
lving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
l
a
n
d
git notes merge: --comm
i
t sho
u
l
d fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes mer
g
e: List c
o
nflicting
n
otes in note
s
me
r
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merg
e
: Manua
l
c
o
nflict resolution, part 2
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git n
o
tes merge:
M
a
n
ual conflic
t
reso
l
u
t
io
n
, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
nd
Documentation
:
Prelimin
a
ry docs on 'git
n
otes mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t no
t
e
s
merge: Add au
t
omati
c
confli
c
t resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t not
e
s merge: Handle real, non
-
con
f
l
i
cting note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
b
ui
l
tin
/
n
otes
.
c:
R
e
factor
c
rea
t
ion o
f
notes
commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes
m
erge
:
I
ni
t
ial
implem
e
ntatio
n
h
a
ndling triv
i
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
builtin/note
s
.
c
: Split notes ref DWIMmery into a s
e
parate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
notes
.
c: Use two newl
i
nes (
i
nstead of
o
n
e) when
c
o
n
ca
t
en
a
tin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
(
t
r
i
via
l
)
t3
3
03
:
Ind
e
nt wit
h
tabs inst
e
ad of
s
p
aces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an H
e
rland
notes
.
h/c: Pro
p
agat
e
combin
e
_
notes_fn
r
e
t
urn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
He
r
land
not
e
s
.
h/c: Allow
combine_n
o
tes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
c:
R
e
order functions
in
p
rep
a
ration fo
r
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make def
a
u
lt_notes_ref() ava
i
lable in no
t
es API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Her
l
a
n
d
(
trivial) notes
.
h: Minor documentat
i
on fix
e
s t
o
copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
n
otes
.
c: H
e
xify SHA1 in die()
m
essage from init
_
not
e
s(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n Her
l
an
d
n
o
t
es: Don't c
r
eate (emp
t
y
)
c
o
mmit
w
he
n
removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n Herl
a
nd
E
n
ab
l
e custom schemes
for
c
olumn colors in the grap
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
nd
Make graph_next_li
n
e() av
a
ilabl
e
in the gra
p
h
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han
Herland
revi
s
ion:
Turn off h
i
st
o
ry simpl
i
fi
c
a
tion i
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revisi
o
n: Fix typo in --ances
t
ry-path erro
r
message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erlan
d
D
o
cumentation/rev-list-options
.
txt: E
x
plain --a
n
ce
s
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
D
ocume
n
tation/rev-list
-
opti
o
ns
.
txt: F
i
x
m
issing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
a
n Herland
diff
.
c:
E
nsure "index
$
from
.
.
$
t
o" line
c
ontains unambi
g
u
o
us
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan H
e
rland
b
uiltin-notes: M
i
nor (mostly pa
r
se_
o
ptions-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule
s
u
m
mary: Don't
barf when invoked
in a
n
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s
: Add "copy" subcommand for
c
o
p
y
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builti
n
-notes: Misc
.
refactor
i
ng of argc and ex
i
t v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-not
e
s: Add
-c
/
-C options for reus
i
ng notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
l
tin-n
o
t
es: Refactor handling o
f
-F o
p
ti
o
n
to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Deprecate th
e
-
m
/
-F options for
"
gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-
n
otes: Ad
d
"
a
ppend
"
subcomma
n
d for
a
ppen
d
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herla
n
d
bu
i
ltin-n
o
tes: Add "
a
d
d
"
su
b
command
for
a
dding
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
b
u
iltin-notes
:
Add --message/-
-
file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
bui
l
tin
-
n
o
t
es: Add "list"
subcommand for
l
isting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Docum
e
ntation: Generalize git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
builtin-notes: Add "pru
n
e" s
u
b
c
omma
n
d for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: pru
n
e_notes(): Prune notes
that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: V
e
rify that removi
n
g
notes trig
g
ers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
builtin-not
e
s: Add "remove"
s
ubcommand for r
e
m
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach builtin-note
s
to rem
o
ve empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
T
e
ach notes cod
e
to properly
preserve non-no
t
es in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t330
5
: V
e
rify th
a
t
adding ma
n
y n
o
tes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t3
3
01: Veri
f
y successful annotation of non-com
m
i
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
B
uiltin-
i
fy git-not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
R
e
factor note
s
co
n
c
a
tenat
i
on
i
nto
a fle
x
ible inter
f
ace
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
N
o
tes
API: Allo
w
multiple concurren
t
notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s
API: write_notes
_
tree(): Sto
r
e th
e
no
t
es tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: for_each_note
(
):
Trav
e
rse
t
he en
t
ire not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
Notes API: get_note(): R
e
turn the note annota
t
ing th
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rl
a
n
d
Notes
API: remove_note(): Remove n
o
te object
s
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
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
H
erland
No
t
es
A
PI: init_notes(): Init
i
al
i
z
e
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
e
r
l
and
Add t
e
s
t
s
f
o
r ch
e
cking c
o
rrec
t
h
a
ndling o
f
$
GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
Notes
A
PI: get_
c
ommit_notes() -
>
format_note() +
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
M
i
nor cosmetic fix
e
s
to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joh
a
n Herlan
d
built
i
n-
c
onfig: Fix crash when us
i
ng "
-
f
<
r
el
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
Add
mo
r
e test
c
ases
to
test fast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to t9350, to make room
fo
r
more fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-impo
r
t
: Proper notes tree manipu
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan
H
e
r
la
n
d
Fix c
r
asher on enco
u
ntering
SHA1-like no
n
-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
a
n
Herland
B
a
sic build infrastruc
t
ur
e
for Python scri
p
ts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
rland
Add selft
e
sts
v
e
r
i
f
ying
c
oncaten
a
tion of multiple n
o
te
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Refacto
r
notes code to concatena
t
e mul
t
ipl
e
notes an
n
otatin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Ad
d
selft
e
sts
v
e
rifyin
g
that we
ca
n
p
a
rse not
e
s tre
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach t
h
e
n
o
t
es
l
ookup c
o
de
to parse notes tre
e
s wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
Teach notes code
to free its inte
r
na
l
data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next