repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jn/gitweb-dependency' into maint
2011-05-13
Joha
n
Herl
a
nd
t5400: Fix a coupl
e
of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan H
e
rland
-
-
dirst
a
t:
I
n
c
ase of
r
enames, use tar
g
et fil
e
name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
H
erland
T
e
ach
-
-dirsta
t
not to c
o
mpletely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
He
r
land
-
-dirst
a
t-by-file: Make it faste
r
and
m
ore c
o
rre
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
r
lan
d
--dirstat: D
e
scribe non-obvious
d
i
ffere
n
c
e
s relat
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
e
rlan
d
b
r
anch/checkout --track:
Ensure that
upstre
a
m branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herla
n
d
push
.
default:
Rename 'track
i
n
g
' to
'
upstr
e
am'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
Pr
o
vide
'git merg
e
--abo
r
t' as
a
synonym to 'git r
e
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herland
cmd_
m
erge(): Parse
option
s
before checking
M
ERGE_HEA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
Pr
o
vide 'git
n
o
t
e
s get-ref' to easily retrieve curre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add
t
estcases for merging notes
t
re
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herl
a
nd
gi
t
notes merge
:
Add ano
t
he
r
a
u
to-resolvi
n
g s
t
rateg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge
:
--
c
ommit s
h
o
u
ld fa
i
l if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes m
e
rge:
L
ist
c
o
n
flic
t
ing n
o
tes in notes me
r
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
it notes merg
e
: M
a
nual confl
i
ct resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git
notes merge: Man
u
a
l
confl
i
ct resolution
,
part
1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
Doc
u
me
n
tation: Preliminary do
c
s on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
no
t
es
m
e
r
g
e: Ad
d
automa
t
ic
c
on
f
lict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
g
i
t notes merge:
H
and
l
e real, non-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/
n
otes
.
c: Refactor c
r
eation of
n
o
tes com
m
it
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: Initial i
m
pl
e
ment
a
t
io
n
handli
n
g trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builti
n
/notes
.
c: Split note
s
ref
D
W
IMme
r
y into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
c: Us
e
two newlines
(instead of one) when conc
a
tenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
(tr
i
vial)
t
33
0
3
:
Indent
with tabs inst
e
ad
of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
e
s
.
h
/
c: Pro
p
a
g
a
te combine_notes_f
n
return
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
e
rlan
d
note
s
.
h/c:
A
llow c
o
mbine_notes functions to re
m
ove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herl
a
nd
no
t
es
.
c: Reorder funct
i
ons
in preparat
i
on for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
h: Ma
k
e defa
u
lt_
n
otes_ref() available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(tr
i
vi
a
l) notes
.
h: Minor documentat
i
on fixes to copy_note
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
erland
notes
.
c: Hexi
f
y SHA1 in d
i
e() message fro
m
init_n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herla
n
d
notes: Don't cre
a
te (emp
t
y) commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
e
r
land
Enable custom schemes for col
u
mn colors in the gr
a
ph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_next_l
i
ne()
a
v
a
ila
b
le in t
h
e graph
.
h
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
rev
i
s
i
o
n: Turn off
h
is
t
or
y
simplificati
o
n in --ance
s
t
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
revis
i
o
n
: Fix typo in --an
c
estry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
oha
n
Herland
D
ocumentation/re
v
-
list-options
.
txt: Explain --a
n
cestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
Documen
t
ation
/
rev-l
i
st-options
.
txt: Fi
x
mi
s
sing
l
ine
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n Herland
di
f
f
.
c: Ensure "index
$f
r
om
.
.
$to" lin
e
contains u
n
ambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan
H
erland
bu
i
ltin-no
t
e
s
:
M
i
nor (most
l
y parse_
o
ptions-re
l
ated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han He
r
land
sub
m
odule
su
m
mary: Don't barf when in
v
oked in an
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
builtin
-
notes:
Ad
d
"copy" subcomm
a
nd
f
o
r
copyin
g
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
b
u
i
ltin-n
o
tes: Misc
.
r
efactoring
o
f a
r
gc
a
nd exi
t
va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-no
t
es
:
Add
-c/
-
C o
p
tions f
o
r reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-no
t
es: Refactor handling of -F
option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herla
n
d
built
i
n-notes: Dep
r
ecate th
e
-m/-
F
opt
i
o
n
s
for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
b
uiltin-
n
otes
:
Add "appe
n
d"
s
ubc
o
mmand fo
r
append
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bui
l
t
i
n-notes: Add "add" subcomm
a
n
d
for
adding n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
bui
l
ti
n
-no
t
es: Add
-
-message/--fi
l
e alias
e
s
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes: A
d
d
"
list" sub
c
omma
n
d
f
or lis
t
ing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Do
c
ument
a
tion: Generalize git-notes d
o
cs t
o
'
o
bjects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Add
"
p
r
une" sub
c
ommand for removi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n
H
erla
n
d
Notes
A
P
I:
pru
n
e_notes(): Prun
e
no
t
es that be
l
on
g
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3305:
Ve
r
ify that removing notes tr
i
gg
e
rs
automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
b
u
iltin-notes:
Add "remove" subcommand for r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Tea
c
h builtin-notes to remov
e
empt
y
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach not
e
s code to prop
e
rly preser
v
e no
n
-note
s
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t
3305: Verify that adding ma
n
y n
o
tes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
r
l
and
t
3301: Verify su
c
cessful annot
a
tion of non-commi
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-ify
g
it-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
a
n
d
R
e
factor notes
concat
e
nati
o
n into a fle
x
ible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
te
s
API: Allow m
u
l
t
iple conc
u
rrent notes
trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I: wr
i
te_notes_t
r
ee(
)
: Store the notes t
r
ee
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rlan
d
N
otes AP
I
: for
_
each_note(): Traverse the ent
i
re n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API: get_note
(
): Return the
n
ote ann
o
tating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes
API
:
rem
o
v
e_no
t
e(): Remove note obje
c
ts from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API:
add_note(): Add note
objects to the intern
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Notes API:
i
ni
t
_notes(): In
i
t
i
a
li
z
e the
n
o
tes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Add tests
for checking correct handling o
f
$GIT_NOTE
S
_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI
:
g
e
t_commit_notes() -> format_no
t
e()
+
r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Minor co
s
me
t
ic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
o
han H
e
rland
builtin-config:
F
ix cr
a
s
h
when using "
-
f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan He
r
land
Add m
o
re testcases t
o
test fast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erla
n
d
Ren
a
me t9
3
01 t
o
t93
5
0, to ma
k
e roo
m
f
o
r more
f
as
t
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-import: Pr
o
p
er notes tree m
a
nipul
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Jo
h
a
n
Herland
Fix cra
s
h
er on encou
n
t
ering SHA1-like
non-
n
ote in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joh
a
n
Herland
Basic build
i
nfrastructure for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Add selft
e
sts verif
y
ing concatenation o
f
mul
t
iple
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
Refactor notes co
d
e to co
n
catenat
e
multiple notes a
n
n
otating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Her
l
and
Add self
t
e
sts verifying that we can parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
Teach the notes lookup code to parse notes tr
e
es with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
rland
T
each notes code to
f
r
e
e
its internal data st
r
uctures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
He
r
land
A
dd flags
t
o get_c
o
m
mit_notes() to control the f
o
rmat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3302-not
e
s-
i
nd
e
x-ex
p
ensive: Speed up cre
a
t
e
_r
e
po()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
fast-i
m
port: Add
s
uppor
t
for
i
m
por
t
i
ng commit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herl
a
nd
Teach "-m <msg>" and "
-
F <file
>
" to
"
git notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
J
o
han Herland
gi
t
clone:
Add -
-
r
ec
u
rsive to a
u
t
o
matically checkout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Herland
t7407:
U
se
'rev-
p
a
rse
--s
h
o
r
t' rather t
h
a
n bash's substrin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
an He
r
lan
d
git submodule status:
Add --
r
ecursive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rla
n
d
g
i
t submodule update: Introduce --
r
ecursive to upd
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
a
n Herland
g
it submodule foreach: Add
-
-
recursive to recurse in
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan Herland
g
i
t
sub
m
odu
l
e foreach: t
e
st
access
to s
u
b
m
odule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Joha
n
Herl
a
n
d
A
d
d selftest for 'git
s
ubmodule fo
r
each'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
and
g
it submod
u
l
e
: Cleanu
p
usage st
r
i
n
g and
a
dd option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Johan Herland
g
i
t submod
u
le foreach: Provi
d
e access to
s
u
b
module
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan
H
erland
h
el
p
.
c:
g
ive corr
e
ct
s
tructure's
s
ize to mem
s
et()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
Johan Herland
q
uic
k
fet
c
h(): Prevent ove
r
flow o
f
the re
v
-l
i
st command
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
J
ohan Herlan
d
g
it-submodule
:
add
s
u
pport for --merg
e
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Jo
h
an Herland
Rename submo
d
ule
.
<
n
ame>
.
re
b
a
se to submodule
.
<
na
m
e
>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
Joh
a
n Herland
Upda
t
e d
o
c
s on behaviou
r
of 'core
.
sharedRepos
i
t
ory
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
Johan Herland
M
o
ve chmod(foo, 0444) in
t
o move_temp
_
to_fi
l
e()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next