repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t5400: Fix a couple of typos
2011-05-13
J
ohan Herland
t5400:
F
ix
a
couple of
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: In case of r
e
n
ames, u
s
e target filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
e
r
land
T
e
ach --dirstat not to comp
l
e
tely ignore rearr
a
nged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rland
--dirstat-by-file
:
Mak
e
it faster and more
corre
c
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
-
-
dirstat
:
Describe
non-obvious diffe
r
ences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
Herland
bran
c
h/
c
heckout
--track: Ensure that upstrea
m
branc
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default: Rename 'tracking
'
to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git mer
g
e --abort'
a
s
a
s
y
nonym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
cmd_merge(): Parse o
p
tio
n
s
b
efore
c
h
e
cki
n
g
M
ERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide
'git notes
ge
t
-ref' to eas
i
ly retrieve cu
r
rent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
He
r
land
git not
e
s merge: Add
testcas
e
s
f
or mergi
n
g notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add another auto-resolving s
t
r
ateg
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: --commit should
f
ail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git note
s
mer
g
e: L
i
st conflicti
n
g n
o
tes
i
n
notes m
e
rge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merge: M
a
nual c
o
nfli
c
t resolut
i
o
n
, 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 me
r
ge: Manual conflict re
s
olution, part 1/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
Docu
m
ent
a
tion:
Prelim
i
nary docs on 'git not
e
s
merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git
not
e
s
m
erge
:
Add auto
m
a
t
ic co
n
flic
t
r
e
s
o
lvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git n
o
tes merge: Handle
r
eal, non-conf
l
ict
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
buil
t
in/notes
.
c:
Re
f
ac
t
or creatio
n
of note
s
co
m
mits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes
m
erge: I
n
itial implementation
h
andlin
g
tr
i
v
ial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
b
u
ilti
n
/no
t
e
s
.
c: Sp
l
it not
e
s ref D
W
IMmery into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
n
o
tes
.
c: Use two newline
s
(in
s
t
e
ad of o
n
e) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erland
(trivial) t33
0
3: I
n
dent
w
ith t
a
bs instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
not
e
s
.
h/c:
P
ropag
a
te co
m
bine
_
no
t
es_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
l
and
n
otes
.
h/c: Allow combine_notes functions
t
o remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herla
n
d
notes
.
c: Re
o
rder functions in preparati
o
n for nex
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an He
r
l
a
n
d
not
e
s
.
h: Make
default
_
notes_ref(
)
availa
b
l
e in no
t
es API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
(tri
v
ial)
n
otes
.
h
: Minor d
o
cume
n
t
ation fixes
t
o
copy_
n
otes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hexify SHA1
in di
e
() message from in
i
t_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n Herland
notes:
D
on't creat
e
(empty
)
commit when rem
o
ving
non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
J
oha
n
He
r
land
Enable custom s
c
h
emes for column colors in
the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herlan
d
M
ake graph_n
e
x
t
_line() available in the g
r
aph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
r
e
vision: Turn off history sim
p
lific
a
tion
in -
-
ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix
t
ypo in --ancest
r
y-path
e
rr
o
r
message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
r
land
Documentation
/
rev-li
s
t-options
.
txt: Explain --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Documentation
/
r
e
v-lis
t
-options
.
t
x
t
: Fix missin
g
line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan He
r
l
a
nd
d
i
ff
.
c
:
Ensure "in
d
ex $from
.
.
$to"
lin
e
co
n
tains u
n
amb
i
guo
u
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
bu
i
lt
i
n-notes: Minor (mostly parse_options-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n Herland
submodule su
m
mary
:
Do
n
't barf when i
n
v
o
ke
d
in
a
n empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
bu
i
l
t
in
-
n
o
t
e
s
: Add "copy"
subc
o
m
mand for copy
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
builtin-notes: Misc
.
refacto
r
ing of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-no
t
e
s: Add -c/-C o
p
tions f
o
r reusing
n
otes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bui
l
tin-note
s
: Ref
a
ctor
handling of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uilti
n
-notes: De
p
reca
t
e t
h
e
-
m/-
F
o
ptions for "g
i
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builti
n
-notes: Ad
d
"append" subcommand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
bu
i
ltin-notes:
A
dd "add" su
b
command
for a
d
d
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Add --
m
essage
/
--
f
ile ali
a
ses for
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
a
nd
builtin-notes: Add
"
list" su
b
co
m
mand for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Docum
e
ntation: Gener
a
lize git-notes docs to
'objec
t
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
u
iltin-notes: A
d
d "prune" s
u
bcomm
a
nd for removin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n He
r
land
Note
s
API: prune_not
e
s(): Pr
u
ne no
t
es that bel
o
n
g to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
nd
t3305: Verify th
a
t r
e
moving not
e
s tr
i
ggers a
u
tomat
i
c
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
builtin-notes: Add "rem
o
ve"
subcomm
a
nd
for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Te
a
ch builtin-notes to remove empty
no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
Teac
h
notes code to properly
pr
e
serve no
n
-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
t3305: Ver
i
fy that
a
d
ding many notes
with
g
it-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: V
e
rify successful
annot
a
ti
o
n of non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
B
uilti
n
-ify git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
Ref
a
cto
r
no
t
es concatenation int
o
a f
l
exible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: Allow
m
ultiple concurre
n
t notes
t
ree
s
with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
N
otes AP
I
: wr
i
te_notes_tree
(
): Sto
r
e the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
Notes API: for
_
e
ach_note(): Travers
e
the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Note
s
API: get_note(
)
: Return the note ann
o
t
ating t
h
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Note
s
API: remove_not
e
(): Remove note objects
f
r
o
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI: add_note(): Add
note o
b
jects
t
o
the intern
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes
A
PI: init_notes(): Initia
l
ize the no
t
es t
r
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 fo
r
checking cor
r
e
ct handling of $GIT
_
NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
ge
t
_
c
om
m
it_notes() -
>
format_note() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Minor
cos
m
e
t
ic f
i
x
es
t
o notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan H
e
rlan
d
b
uilt
i
n-co
n
fig: Fix
crash when
u
s
ing "-
f
<
rel
a
tive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n
H
erland
Add more test
c
ases to test
f
ast-impo
r
t of
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herl
a
n
d
Rename
t
9301 to t9350, to
m
ake
r
oom f
o
r mo
r
e
f
a
st-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
f
a
st-imp
o
rt: Prop
e
r
notes tree
ma
n
i
p
ulati
o
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan He
r
land
Fix crash
e
r
o
n encounterin
g
S
H
A
1-like
n
on-note in no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan H
e
rland
Basi
c
b
u
ild infrastructure for Python scripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Ad
d
selft
e
sts verifying
con
c
aten
a
tion of mul
t
i
p
le notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erl
a
nd
Refactor notes
c
ode to concaten
a
te multiple not
e
s annotatin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
r
land
A
d
d
selftests verifyin
g
that we c
a
n parse notes tr
e
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herl
a
nd
Teach the not
e
s l
o
okup code to pa
r
se notes t
r
e
e
s
with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach note
s
code to fre
e
its internal
data st
r
u
c
tures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add flags to get_commit_notes() t
o
contr
o
l
the format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
Herland
t
33
0
2-
n
otes-inde
x
-
e
xpensive: S
p
eed up crea
t
e_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
n
d
f
ast-import: Add
support
f
or importing
c
ommit notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
a
n
Herland
T
e
a
ch "-m <msg>" a
n
d "-F <fi
l
e>" to "git notes edi
t
"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan H
e
rlan
d
git clone: Add --recursive to automatically checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herl
a
n
d
t7407: U
s
e 'rev
-
par
s
e
-
-short' rather than
b
as
h
'
s substring
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule status: Add -
-
recursive to recu
r
se i
n
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
han
Herland
git s
u
b
m
o
du
l
e update:
I
nt
r
oduce --recursive
to update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herl
a
nd
git submodule foreach: Add --recursive to
r
ecurse
i
n
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git subm
o
dule foreach: test access
t
o submodule name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan
Herland
Add selftest fo
r
'
g
it
s
ubmodule f
o
r
each'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herland
git su
b
m
o
dule: Clea
n
u
p
u
sa
g
e str
i
ng and add op
t
ion
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Joha
n
Herl
a
n
d
git submodule
f
oreach: Provide a
c
cess
t
o sub
m
o
d
ule
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Joha
n
Herland
help
.
c:
give correc
t
s
t
ruc
t
u
r
e's
s
ize to
m
emset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
J
ohan He
r
land
q
u
ickf
e
tch(): Prevent
o
verflow of the rev-list command
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herland
git-submodule: ad
d
support
for --merg
e
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Johan H
e
rland
Rename
submodu
l
e
.
<name>
.
rebas
e
to s
u
bmodule
.
<name>
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-04-18
Johan Her
l
a
nd
U
pda
t
e do
c
s o
n
behavi
o
ur of 'core
.
share
d
Repository
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
M
ove chmod(foo, 0444) into move_temp_to_file()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next