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
Sixth batch for 1.8.1
2012-10-21
Johan
Herlan
d
git symbolic-re
f
--delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Her
l
a
nd
notes-merge: Don't r
e
move
.
git/NOTES_MERGE_WO
R
K
TREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
a
nd
n
o
tes-merge: use open
d
ir/
r
e
a
ddir instead of using read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
t
3310: illustrat
e
failure to "no
t
es merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
f
ast-i
m
por
t
: Fix incorrect
fa
n
out level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2n
d
testcase expos
i
ng b
u
gs in fast-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
t9301: Fi
x
testcase covering up
a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400
:
Fix
a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Mark dirs
t
a
t
e
rror messages for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Im
p
rove e
r
ror handling when
p
arsing
dir
s
t
a
t parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --dirstat=lines mode, doing d
i
rs
t
a
t
analys
i
s
b
ased
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Allow specify
i
ng
--
d
i
rstat c
u
t-off perce
n
ta
g
e
a
s
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herlan
d
A
dd config variab
l
e f
o
r
specifying def
a
u
lt -
-
dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Refact
o
r --dirs
t
at
parsing; deprecat
e
--cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herla
n
d
Make
-
-dir
s
tat=0 outp
u
t
directories th
a
t c
o
ntribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an Herl
a
nd
A
d
d
s
everal t
e
stca
s
e
s
for --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
ha
n
Herland
--dirstat: In c
a
se of
renames, use ta
r
g
e
t filen
a
me
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
T
e
ach --dirstat
n
ot to compl
e
tely
ignor
e
rearr
a
n
ged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--di
r
s
t
a
t-by-file: Make it faster and mo
r
e
correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
--dirstat:
D
e
scri
b
e non-obvious differences
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
M
a
k
e
"git
no
t
es add" more user-friend
l
y when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
a
n
Herland
l
og/p
r
etty
-
o
p
tion
s
: Document -
-
[no-]notes and
d
eprecat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
ohan
H
e
rland
branch/
c
heckout
--trac
k
: E
n
sure
that u
p
s
tream
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan He
r
land
push
.
d
e
fa
u
lt: Rename 'track
i
ng' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Provide 'g
i
t
merge -
-
abort' as a s
y
nonym t
o
'git r
e
set
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
cmd_
m
erge(): Pars
e
option
s
befor
e
checkin
g
MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
P
r
ovide 'git notes
get-r
e
f' to e
a
sily
r
e
trieve
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
n
d
g
i
t note
s
m
er
g
e: Add testcas
e
s
for me
r
ging not
e
s tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
it not
e
s merge
:
Add
a
nother auto-reso
l
ving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
i
t
n
o
t
es mer
g
e: --commit should fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes
m
erge: List conflicting notes in note
s
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
g
it notes mer
g
e
:
Man
u
al c
o
nflict
r
esol
u
tion, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rland
git notes
m
erge: Ma
n
u
al con
f
l
ict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Docume
n
t
ati
o
n: Preliminary docs
o
n 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
gi
t
n
otes
merge: Add aut
o
mat
i
c conflict reso
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
g
i
t notes merge: Handle real,
non-conflicti
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bui
l
t
i
n
/
notes
.
c:
R
e
f
act
o
r cre
a
tion of notes
c
o
mmits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git n
o
tes m
e
rge:
I
n
i
tial
i
mplementation ha
n
dling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/no
t
es
.
c: Split note
s
ref
D
WIMmery in
t
o a
separa
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
e
s
.
c: U
s
e two newlin
e
s (in
s
t
ead of on
e
)
when c
o
ncatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
(t
r
ivial) t3303:
Inden
t
with tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h
/
c: Pro
p
a
g
ate combine_no
t
e
s_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h
/c: A
l
low
c
om
b
ine_notes functions to remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
not
e
s
.
c: Reorder functions in prepar
a
tion for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
no
t
es
.
h
:
Make d
e
faul
t
_notes_ref() available in
notes
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
l
and
(t
r
i
v
ial) notes
.
h: Minor documentati
o
n fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
c: Hexify
S
HA1 in die(
)
me
s
sage from init_
n
o
tes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't cr
e
ate (empty) commit when rem
o
ving no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herland
Enabl
e
custom schemes for c
o
lumn
colors i
n
the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herland
M
ake
graph_
n
ext_line
(
)
availa
b
l
e
in the
graph
.
h A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
revision:
Turn of
f
h
i
story s
i
mplification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revi
s
io
n
: Fix typo i
n
-
-
a
ncestry-path e
r
r
o
r
message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
ument
a
tion
/
r
ev-l
i
st
-
options
.
t
xt:
Explain
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentatio
n
/rev-list-options
.
txt: F
i
x missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herlan
d
d
i
ff
.
c
:
Ensure
"
in
d
ex $from
.
.
$to" line co
n
tains u
n
ambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builti
n
-
notes:
M
inor (mostly parse_option
s
-relat
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
a
n Herland
submodule summa
r
y: Don't ba
r
f whe
n
i
n
voked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-note
s
: Ad
d
"copy" subcomma
n
d
for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es: Misc
.
refactoring of argc and
exi
t
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
b
u
ilti
n
-
notes: Add -c
/
-C options for reu
s
in
g
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builti
n
-notes: Refacto
r
h
a
ndl
i
ng of -F optio
n
to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-not
e
s: Deprecate the -m/-F options f
o
r "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
builtin-notes: Add "app
e
nd"
s
ub
c
ommand
for
appendin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builti
n
-n
o
tes:
A
dd "add" subcommand for addin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
builtin-note
s
: Add -
-
message/--file ali
a
s
e
s
f
or -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-no
t
e
s
: Add "list"
s
ubco
m
man
d
f
o
r l
i
sting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentati
o
n:
Generalize gi
t
-
notes
docs to
'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
note
s
:
A
dd "
p
r
une" subcommand
f
or removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
No
t
es
API: pru
n
e_
n
ot
e
s(): Prune notes th
a
t belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t3305: Ver
i
fy
that removing notes triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
b
uiltin-notes: Add "remove" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Teach
b
uiltin-notes to re
m
ove empty not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes code to prope
r
ly preserve n
o
n-not
e
s
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
t3305: Verify tha
t
adding many notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herl
a
n
d
t3301: Veri
f
y successfu
l
annot
a
tion of
n
on-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Builtin-
i
f
y git-not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
Refacto
r
notes co
n
catena
t
io
n
i
nto a flex
i
bl
e
int
e
rface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an H
e
rl
a
nd
Notes API
:
Al
l
ow
mu
l
ti
p
l
e
conc
u
rren
t
n
o
tes trees wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: wri
t
e_no
t
es_tree
(
): Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
Not
e
s API: for_ea
c
h
_note():
Trave
r
se the entire
no
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Not
e
s API: g
e
t_
n
ot
e
(): Return
t
he note annotating
t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes
A
P
I
: rem
o
ve
_
note(): Remove
n
o
t
e
o
bje
c
ts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes A
P
I: add_note(): Add note objects
to the in
t
e
r
nal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
N
otes
A
PI: init_notes
(
):
I
n
itialize the
n
ote
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
A
dd tests
f
or ch
e
cki
n
g correc
t
handling
of $GIT_NOTE
S
_
R
EF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_commit_not
e
s() -> format_note()
+ remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
Minor co
s
metic
fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builti
n
-config:
F
ix crash when u
s
in
g
"
-
f
<relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add more testcase
s
to t
e
st fast-imp
o
r
t
of n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Herland
Ren
a
me t930
1
to t935
0
,
to mak
e
r
o
o
m
for mo
r
e
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-
i
m
p
o
rt: Proper
notes tre
e
manipulat
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fi
x
crashe
r
on e
n
counter
i
ng SHA1-l
i
ke
non-note i
n
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic build infr
a
structure
f
or
P
ython s
c
r
i
p
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
d
d selftests
ver
i
f
y
ing co
n
ca
t
enation o
f
mul
t
iple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
a
n He
r
land
Ref
a
c
t
or not
e
s code to concaten
a
te
multiple notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
r
l
and
Add selftests verifying
that
w
e
can parse
n
o
t
e
s
t
re
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
oha
n
Her
l
and
Teach the notes lookup code to pars
e
notes tree
s
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rl
a
n
d
Teach notes code to f
r
ee
i
ts i
n
te
r
n
a
l data
s
t
ructures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Her
l
and
Add flags to get_com
m
it_n
o
t
e
s()
t
o co
n
t
r
o
l the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
l
a
nd
t
3
302
-
n
o
t
e
s-i
n
dex
-
expensive: Speed u
p
creat
e
_r
e
po()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next