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
git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
2011-05-13
Johan Her
l
and
t
5400:
Fix a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Mark d
i
rstat
error mess
a
ges for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Improve error hand
l
ing when parsing dirstat p
a
rameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
New --di
r
stat=
l
ines mode, doing dirstat anal
y
sis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Allow
s
pecify
i
ng
--di
r
st
a
t c
u
t
-of
f
percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
A
dd co
n
fig v
a
ri
a
ble for specifyi
n
g default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
R
efacto
r
--
d
ir
s
tat parsing;
d
eprec
a
te -
-
cumu
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Make --dirstat=0
output
d
irectori
e
s
that
c
o
ntribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
d
d se
v
eral testcases for --di
r
st
a
t and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herla
n
d
-
-dirsta
t
: In
case of
ren
a
m
e
s, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
H
erlan
d
Teach --dirsta
t
no
t
to completely i
g
nore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
--dirstat-by-file: Make it faster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
n
d
--dirstat: Describe
non-obvious di
f
ferenc
e
s
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
Make "g
i
t
n
o
tes ad
d
"
more user-friendly
wh
e
n there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herla
n
d
l
o
g/
p
retty-
o
ptions:
Docum
e
nt --[no
-
]
n
otes and
d
e
pre
c
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
bran
c
h/checkout --track: Ensur
e
that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Jo
h
a
n Herland
push
.
default: Rename 'trac
k
ing' to
'
u
pstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merg
e
--abort' as
a
sy
n
onym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
cmd_merge
(
):
P
a
rse
options before c
h
ecking MERGE_H
E
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide '
g
it notes get-
r
ef'
t
o
easily retri
e
ve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git note
s
m
erge: Add testcases f
o
r
m
ergi
n
g
n
otes tr
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
H
erland
git no
t
es
merge:
Add another
a
u
to-r
e
solving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
git no
t
es merge:
--commit should fai
l
if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
lan
d
git notes merge
:
Li
s
t
confli
c
ting notes in
n
otes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herl
a
nd
git no
t
e
s
merge: Manua
l
conflict reso
l
utio
n
,
pa
r
t 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
git notes merge
:
Manual conflict resolution,
p
art 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Documentation:
P
reli
m
inary docs on 'g
i
t
notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
gi
t
notes me
r
ge: Add automatic c
o
n
f
l
ict r
e
solvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge: Handle real
,
non-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
builti
n
/notes
.
c
: Refactor creation of
n
otes
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
git notes merge: Init
i
al implementation han
d
ling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builtin/notes
.
c: Spl
i
t
notes ref
D
W
I
Mmery
i
n
t
o a sep
a
r
a
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c:
U
se two ne
w
li
n
es (instead
o
f one
)
when concatenat
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial)
t
3303: I
n
dent with t
a
bs instead
o
f spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
n
d
note
s
.
h/c: Propa
g
ate co
m
bin
e
_not
e
s
_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
n
otes
.
h/c: Allow combine_n
o
t
es fu
n
ctions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c: Reorder functions i
n
prep
a
ra
t
ion for ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Mak
e
default
_
n
o
tes_ref() availab
l
e in
notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(triv
i
al)
n
o
te
s
.
h: Minor documentat
i
o
n fixes to c
o
py_not
e
s
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
erland
no
t
es
.
c
: H
e
xify SHA1 in die() m
e
ss
a
ge fr
o
m
init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan H
e
rland
notes: Don't create (empty) commit when removi
n
g
n
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Enable custom schemes for column co
l
or
s
in the gr
a
ph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
Make
graph_next_l
i
ne()
a
vailab
l
e in
the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
oha
n
Herland
re
v
i
s
i
o
n: Turn off histo
r
y simp
l
ification in
-
-ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
re
v
ision: Fix typo i
n
--ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
o
cumentation/rev-l
i
st-
o
pti
o
ns
.
txt: Expla
i
n --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herl
a
nd
Docu
m
entation/r
e
v-l
i
st-op
t
ions
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan
H
erland
d
i
ff
.
c
:
Ens
u
re
"
in
d
e
x $from
.
.
$to" line contains unamb
i
g
u
o
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han Herland
builtin-n
o
tes: Minor (
m
ostly parse
_
options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
H
e
r
l
and
s
u
bmodule summary:
Don't barf when in
v
oked in
a
n
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-note
s
:
Add "copy" s
u
bcommand
f
or copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: M
i
s
c
.
refactor
i
n
g of argc
a
nd exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
built
i
n-notes: Add -c/-C options fo
r
reusing
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-note
s
: Ref
a
c
t
or handling
of -F option
t
o allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
buil
t
in
-
no
t
es: Depr
e
cate the -m/-F option
s
for "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
builtin-notes: Add "append" su
b
command
f
or appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
builti
n
-notes: Add "add"
s
ubcommand f
o
r add
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd --
m
e
s
s
age/--f
i
le ali
a
ses for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uilti
n
-note
s
: Ad
d
"list" subcomm
a
nd
f
or listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
n
d
Docu
m
entation:
G
eneralize
git-notes docs t
o
'obje
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Ad
d
"prune" subcommand for r
e
mo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
N
o
tes API
:
p
r
une_notes()
:
Pr
u
ne not
e
s that bel
o
ng to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify that removing notes trigg
e
rs aut
o
m
a
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add
"
r
emove" subcommand for re
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
Teach
b
uil
t
in
-
notes to remove em
p
ty note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes code t
o
prope
r
ly pr
e
s
e
rve non-n
o
t
e
s i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: V
e
r
i
fy that add
i
ng many notes wit
h
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
01: Verify successful
annotation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Bui
l
tin-ify gi
t
-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herl
a
nd
Refactor n
o
tes
con
c
aten
a
tion i
n
to a fl
e
xible interf
a
ce
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Note
s
API: Allow m
u
ltiple
concurrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API
:
w
r
it
e
_no
t
e
s_tree(): Store t
h
e
notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes API: f
o
r_each_note(): Trav
e
rs
e
t
h
e entire
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API: get_note
(
)
: Return the n
o
t
e
a
n
n
o
ta
t
i
ng the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
Notes API:
r
e
m
ov
e
_note(): Remove note obje
c
ts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
o
tes
A
PI: a
d
d_
n
ote(): Add note obje
c
ts to the interna
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herl
a
n
d
Not
e
s API: init_not
e
s(): Initializ
e
the n
o
tes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Add t
e
s
t
s
f
or c
h
ecking correct
h
an
d
l
in
g
of $GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
Notes
A
PI: get
_
commit_notes() ->
f
ormat_note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
M
inor co
s
me
t
ic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herla
n
d
builtin-config
:
Fix crash when using
"
-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han
Her
l
and
Add more testcases to
test fas
t
-import of no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herland
Rename t93
0
1 t
o
t9350, to make room
f
o
r
mor
e
f
ast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han
He
r
land
fast-im
p
or
t
: Prope
r
n
o
tes tree man
i
pula
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan He
r
land
Fix crash
e
r on encoun
t
e
r
i
n
g
SH
A
1-li
k
e
non-note
in
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan
He
r
l
a
nd
Basic build infr
a
structure for Python scr
i
pts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
A
dd sel
f
tests ve
r
ifying conc
a
t
e
na
t
ion of
m
ultipl
e
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an
H
erland
Re
f
acto
r
n
o
tes cod
e
to concatenate multiple notes
an
n
otating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Add selftes
t
s ve
r
i
fying that we can parse notes tre
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Teach the not
e
s lookup
c
ode
t
o
parse notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
e
ach notes cod
e
to free its i
n
ternal data s
t
ruct
u
res
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
Add
f
lags t
o
get
_
c
ommit_notes()
to contro
l
the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herl
a
nd
t3302-
n
otes
-
index-ex
p
ensive: Speed
u
p create_repo()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Her
l
a
nd
fast-
i
mpor
t
: Add supp
o
rt for im
p
orting co
m
mit n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan He
r
land
T
e
a
c
h "-m <msg>" and "-F
<file>" to
"
g
i
t no
t
e
s
edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
git clo
n
e
: Add -
-
recursi
v
e to
auto
m
a
t
i
c
ally
c
heckout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t74
0
7: Use 'rev-pa
r
se --short' r
a
ther than bash's substring
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herl
a
nd
git s
u
bmodule status:
A
dd --recursive to
r
ecurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git subm
o
d
ule upda
t
e: Introd
u
c
e --rec
u
rsive to
update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule foreach: Add
--r
e
cur
s
ive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next