repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
2011-11-29
Johan Herland
f
ast-impo
r
t: Fi
x
incorrect
f
ano
u
t level when mo
d
ify
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herland
t
9
301: Add 2n
d
te
s
tcase exposing bugs in fast-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herlan
d
t9301: Fi
x
testcase coveri
n
g up a bug in fast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
H
e
rland
t5
4
00: Fix a couple of
t
ypos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dirstat e
r
ror
m
e
s
sages for tr
a
nsl
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Improv
e
error handlin
g
w
h
e
n
par
s
ing dirstat pa
r
ameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
H
erland
Ne
w
--dir
s
tat=lines
mode, doing dirsta
t
anal
y
sis ba
s
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specifying --
d
irstat cut-off per
c
entage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
r
land
A
dd
c
o
n
fi
g
variable for
s
pecifying default -
-
dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
nd
Refactor --dirstat par
s
ing;
deprecate -
-
cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an Herland
Make --
d
irstat=0 output directo
r
i
e
s that co
n
tribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Add several testcases f
o
r --dirstat and f
r
iends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herl
a
nd
--dir
s
tat: In case of rena
m
es, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
Teac
h
-
-d
i
rstat not to completel
y
ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
He
r
land
--dir
s
tat-b
y
-file: Make it fa
s
ter and more corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--dirsta
t
:
Describe non
-
obvious differences relati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n Herland
Make
"gi
t
notes
add" mor
e
user-friendl
y
wh
e
n there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty-opt
i
ons: Document --[n
o
-]notes and deprec
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
e
r
lan
d
branch/checkout --track: Ensure that upstrea
m
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
pus
h
.
default: Ren
a
me 'tracking' to
'upstream
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Prov
i
de 'git m
e
rg
e
--abort' as a synonym
to
'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
e
rland
cmd_mer
g
e(): Parse
options befo
r
e checking MER
G
E_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
Pro
v
ide 'git notes ge
t
-ref' to easily retrieve cur
r
e
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Her
l
and
git not
e
s merg
e
: A
d
d testcases
for mergin
g
notes
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
gi
t
note
s
merge: Add a
n
other auto-res
o
lving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
g
i
t n
o
tes mer
g
e: --commi
t
s
h
ould fail if und
e
r
l
ying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List conflicting n
o
tes in
notes me
r
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes merge: Manual conflict r
e
s
o
lut
i
on, 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:
Manual conflict resolu
t
ion, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
Doc
u
m
e
n
ta
t
ion: Preliminary do
c
s on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merge: Add
automati
c
confl
i
ct r
e
solve
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
git notes
m
e
r
g
e:
Handle real, non-c
o
nflicting no
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Re
f
actor creati
o
n of no
t
es commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes merge: Ini
t
ial implementation han
d
l
i
ng trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rland
b
u
iltin/notes
.
c: Spli
t
notes r
e
f DWIMm
e
r
y
int
o
a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use two newlines (instea
d
o
f one)
when
c
oncat
e
nat
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
(t
r
ivial) t3303: Indent with tabs instead
o
f
space
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Propagate combine_n
o
tes
_
fn retu
r
n value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h/c:
A
l
l
o
w combine_n
o
tes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
c: Reorder functions
in prepa
r
a
tion for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
note
s
.
h:
M
ake
d
e
fault_notes_re
f
() a
v
a
i
lable in
notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
t
riv
i
al) notes
.
h: Minor docume
n
t
at
i
on fix
e
s to
c
opy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: H
e
x
ify SHA1 in
die() message from ini
t
_
n
otes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Her
l
and
not
e
s: Don'
t
c
r
e
a
te (empty)
c
ommit when r
e
mov
i
ng no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Enable cust
o
m schemes for
c
olumn co
l
ors
in
the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
Make graph_nex
t
_line(
)
availabl
e
i
n the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
r
evision:
T
u
rn off history simplifi
c
a
tion in --ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
rev
i
sion
:
Fix typo in --ancestry-path error mes
s
age
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
Docum
e
ntation/rev-li
s
t
-
o
p
tions
.
t
x
t:
Ex
p
lain --ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
l
a
n
d
Documen
t
ation/rev-list-opti
o
ns
.
txt: Fi
x
mi
s
si
n
g line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
di
f
f
.
c: Ensure "i
n
d
ex $fro
m
.
.
$to
"
line conta
i
ns unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
buil
t
in-notes: Mi
n
or (mostly
p
arse_options-r
e
late
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan He
r
land
subm
o
dule summary: Don
'
t barf when invoke
d
in an emp
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd "copy" subcommand for copying
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bu
i
l
tin-notes: M
i
sc
.
r
ef
a
ctori
n
g
o
f argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin
-
notes: Add -c/-C options for reu
s
ing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
an
d
bu
i
l
t
in-notes
:
Ref
a
ctor h
a
ndli
n
g
of -F
o
p
tion to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes:
D
e
p
recate the -m/-F optio
n
s fo
r
"
git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
n
d
bui
l
tin-notes:
A
dd "append"
s
ubcom
m
and f
o
r a
p
pending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
u
iltin-notes: Add "add
"
s
ubcommand for adding no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
:
Add --message
/
-
-
fi
l
e aliases fo
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
built
i
n-notes:
A
dd "
l
ist" subc
o
mman
d
fo
r
list
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
Documen
t
ation: Gener
a
lize git-notes docs t
o
'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
builti
n
-notes:
A
dd "prune" subcomma
n
d for
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: prune_notes(): Prune notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
t
3
305: Verify
t
hat removing notes triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
bui
l
tin-notes: Add "re
m
o
ve" sub
c
ommand for rem
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach bu
i
lti
n
-n
o
t
e
s to re
m
ove
e
mpty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herlan
d
Teach not
e
s code to properl
y
preserve
n
on-notes i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
t3305: Verify that addin
g
ma
n
y notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301
:
Verify
s
u
ccessful annota
t
ion of
non-c
o
mm
i
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builti
n
-
ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Refactor note
s
concatenati
o
n int
o
a
f
lexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
Notes
A
PI: Allow mul
t
i
p
le c
o
n
c
urrent not
e
s
t
rees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Note
s
API:
w
rite_notes_tree(): Store the notes tr
e
e
.
.
.
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
:
for_
e
ac
h
_note(): Traverse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Not
e
s
API: get_note(): Ret
u
rn the note annota
t
i
n
g
t
he
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
No
t
es
A
PI:
remove_note(): Remove note
o
bject
s
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes
A
PI
:
add
_
note(): Add not
e
objects
to the
inte
r
n
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: init_notes(): I
n
iti
a
lize the notes
tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Add
t
ests fo
r
checkin
g
correct h
a
ndling of $GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: g
e
t_comm
i
t_
n
ote
s
() ->
form
a
t_note() + remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Min
o
r
cosmetic fixes
to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan He
r
land
builtin-
c
onfig: Fix crash when usin
g
"-
f
<relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
h
a
n Herland
Add more testcases to t
e
st fas
t
-import o
f
no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
oh
a
n
H
erland
R
enam
e
t9301 to t93
5
0,
t
o
m
ake room for more fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-import: Prope
r
not
e
s
tree
manipulat
i
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
o
h
an Herla
n
d
Fix crasher on encounterin
g
S
H
A1-like n
o
n-no
t
e i
n
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joh
a
n H
e
rland
B
a
sic b
u
ild infr
a
structure for
Python s
c
ript
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
A
dd s
e
lftests verifying co
n
catena
t
ion of mul
t
ipl
e
no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Refa
c
t
o
r notes
code t
o
c
o
ncatenate m
u
lti
p
le notes anno
t
a
t
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Ad
d
selftest
s
veri
f
yi
n
g that we
c
an par
s
e notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
a
n
Her
l
and
Tea
c
h the notes lo
o
k
up code t
o
p
a
rse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an H
e
r
l
and
Teach no
t
es code to free
its
internal data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herl
a
nd
Add
f
lags t
o
get_commit_not
e
s
(
) t
o
c
o
n
trol the
f
o
r
ma
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302
-
no
t
es-index-expensive:
Speed up crea
t
e_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fast
-
i
m
p
o
rt: A
d
d
s
upport for im
p
orting commit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Teach
"-m <ms
g
>" and
"
-F <f
i
le>" to "git
n
otes ed
i
t
"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Her
l
a
n
d
gi
t
c
l
one: Add --rec
u
r
s
i
v
e to automat
i
cally
c
heckout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan He
r
land
t7407: Use 'rev-
p
a
rse -
-
sho
r
t
' rather than
b
ash
'
s subst
r
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next