repo.or.cz
/
git
/
jrn.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/t1506-shell-param-expansion-gotcha' into maint
2011-05-13
Johan H
e
rla
n
d
t5400: Fix
a
co
u
ple of t
y
pos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
a
n
He
r
la
n
d
--dirs
t
at: In case of ren
a
mes, use targe
t
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han
H
e
rland
Teach --dirsta
t
not to comp
l
e
t
ely
ignore
r
e
a
r
r
anged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herla
n
d
--dirstat-b
y
-file: Make it fast
e
r
a
nd mor
e
correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirst
a
t:
D
e
sc
r
ibe non-obvious dif
f
erences rel
a
tiv
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
erland
branch/checkout --track: Ensure
that
u
pstr
e
am br
a
nch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
defa
u
lt: Ren
a
m
e 'trackin
g
' to '
u
pstre
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Provide
'git me
r
g
e --abort' as a
synonym to 'g
i
t reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
c
m
d
_merg
e
():
Par
s
e option
s
before che
c
king MERGE_
H
EA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provi
d
e 'git note
s
g
e
t
-
ref
'
to
ea
s
ily retrieve cur
r
en
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herlan
d
gi
t
notes merg
e
: Add
testcase
s
for mergi
n
g
n
otes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes me
r
ge
:
Add another auto-
r
esol
v
in
g
s
t
rategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
notes merge: --commit s
h
ould fail
i
f und
e
rlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
g
i
t notes m
e
rge
:
Li
s
t
conflict
i
ng notes in notes
m
erge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes me
r
ge: Manua
l
confl
i
ct res
o
l
ution, part
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
git not
e
s
me
r
ge:
M
anual conflict resoluti
o
n
, p
a
rt
1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation:
P
reliminary docs on
'
git not
e
s merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es m
e
rge
:
Add automat
i
c conflict
r
e
solvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
e
s merge: H
a
ndle real
,
non
-
conflicti
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
builtin/notes
.
c
: Ref
a
ctor cr
e
a
t
i
on
of n
o
tes
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Init
i
al
implementat
i
on
handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
built
i
n
/
no
t
es
.
c: Spl
i
t notes ref
DWIMmery
i
nto a s
e
parate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
not
e
s
.
c:
Use two
n
ewlines (instead of o
n
e) when con
c
atena
t
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
(trivi
a
l) t3303: Indent w
i
th tab
s
instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Propagate combine_notes_fn r
e
turn valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/
c
:
A
llow comb
i
ne_no
t
es functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
not
e
s
.
c: Reorder functions in preparatio
n
f
o
r
n
ex
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
Her
l
a
n
d
note
s
.
h:
M
a
ke de
f
ault_notes_re
f
() available in
n
ote
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h:
Min
o
r
docu
m
entation
f
ixes to
copy_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n Herla
n
d
notes
.
c: Hex
i
fy SHA1 in
die() message
from ini
t
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan He
r
land
n
otes: Do
n
't create (empty) c
o
mmit whe
n
removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custo
m
schemes for column colors in the graph
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make gra
p
h_next_
l
ine() a
v
ai
l
ab
l
e in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
evision: T
u
rn off history simplification i
n
--ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
re
v
ision
:
Fix typo in
--ancestry-path
er
r
or
m
essa
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
Documentation/re
v
-list-options
.
txt: Expl
a
in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rla
n
d
D
ocume
n
t
ation/r
e
v-list-op
t
ions
.
txt: Fix
m
is
s
ing li
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure
"
inde
x
$from
.
.
$t
o
"
lin
e
contains un
a
mbig
u
ous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
h
an Herland
b
uiltin-notes:
M
inor (most
l
y parse_
o
ptions-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
He
r
land
s
ubmodule
summary: Don't barf
when
inv
o
ked
i
n an
e
mpt
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builti
n
-notes: Add "c
o
p
y
" subcommand fo
r
copy
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
bui
l
t
in-notes
:
Misc
.
refac
t
oring of argc a
n
d exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
b
u
iltin-
n
otes
:
Add -
c
/-C option
s
for
reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
buil
t
i
n-
n
otes: Refactor handling of -F option to
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herla
n
d
builti
n
-notes: Deprecate
t
he -m/-F
options
f
or "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
b
u
iltin-notes: Add "a
p
pend" s
u
bcomman
d
for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
b
uilt
i
n
-notes: Add "
a
dd" sub
c
ommand for adding n
o
te
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-
n
otes: Add --mes
s
age/--file alias
e
s for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
b
uiltin-note
s
:
Add "
l
i
st" su
b
command for l
i
sting not
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
er
l
a
nd
Documenta
t
io
n
: Generalize git-notes docs to 'obje
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-not
e
s: Add "prun
e
" subcomman
d
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Not
e
s API:
prune_
n
otes(): P
r
u
n
e notes that
b
elong t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3305:
V
erify
t
h
at remov
i
ng not
e
s tr
i
ggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
uil
t
in-notes: Add "remov
e
" subcommand for rem
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Teach buil
t
in-n
o
tes to remo
v
e e
m
pty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
an
d
Teach notes
co
d
e to prop
e
rl
y
preserve non-notes
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Ver
i
fy that adding man
y
n
o
tes with gi
t
-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
t330
1
: V
e
r
i
fy
s
u
c
cessful annotation of non
-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Bu
i
l
tin-ify git-not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
Refacto
r
notes concatenation i
n
to a flexible inte
r
face
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
Notes API: Allow m
u
ltiple
c
oncurrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: wri
t
e_no
t
e
s
_tree()
:
Store the n
o
tes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Note
s
API: for_ea
c
h_note(): T
r
a
v
erse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes
API: get_note(): Retu
r
n the note annota
t
ing
t
he
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
N
ote
s
API:
r
e
m
o
ve_n
o
te
(
)
:
R
e
move
note
o
bjects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
e
r
land
Notes API:
add_note(): Add note objects t
o
the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
N
o
tes A
P
I: i
n
it_notes():
Initialize the
notes
tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
A
d
d te
s
ts
for che
c
king correct handling of $GI
T
_
NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Notes API: get_com
m
i
t_notes(
)
-
> format_note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
Min
o
r c
o
smetic
f
ixes to
n
otes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan
Herland
builtin-config:
F
ix cr
a
s
h when
u
sing "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
Add more testcases to test fast-impor
t
o
f notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Renam
e
t9301 to t9350, t
o
mak
e
room fo
r
more fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herland
fast-imp
o
rt: Pro
p
er notes tree manipulatio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
oha
n
He
r
la
n
d
Fix crasher on en
c
ountering SHA
1
-li
k
e non-note i
n
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herlan
d
Basi
c
build
i
nfrastructure f
o
r Python
script
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Ad
d
selftes
t
s verifying c
o
nca
t
enation of multi
p
le notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Refactor notes code to
c
o
ncatenate multiple
notes annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herla
n
d
A
d
d selftest
s
verifying that w
e
can parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
Teach th
e
n
o
tes lookup code to parse note
s
trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n He
r
land
T
e
a
ch notes co
d
e t
o
free its internal dat
a
structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Ad
d
flags to get_com
m
it_no
t
e
s
()
to contr
o
l
t
he
for
m
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
t3302-notes-index-expensive
:
Spe
e
d u
p
c
reate_re
p
o()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
a
n
d
fa
s
t-import: Add suppor
t
for i
m
po
r
ting commit notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
T
each
"
-m <msg>
"
and "-
F
<
file>" to "git
notes edit"
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Her
l
and
g
i
t clone
:
A
dd --rec
u
rsive to aut
o
m
a
tical
l
y checkout
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-20
Johan Her
l
and
t7
4
07: Us
e
'
r
ev-parse --
s
hort'
r
a
t
h
er than bash's substr
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submod
u
le s
t
atus: Add
--recu
r
sive to recurse into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git
submo
d
ule u
p
d
a
te: Introduce --recursi
v
e to update
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan H
e
rland
git submod
u
l
e for
e
ach:
Add --recu
r
si
v
e to
r
ecurse in
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan
H
erland
g
it submodu
l
e
f
o
reach: te
s
t
acc
e
ss to subm
o
dule name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
an Herland
Add
selftest for 'git s
u
bmodu
l
e for
e
ach'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git s
u
bmodule: Cleanup usa
g
e string and
a
dd option
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-18
Jo
h
an He
r
land
git submod
u
le foreach: Provide acce
s
s
to
submodu
l
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-08-12
Johan Herland
help
.
c: give c
o
rrect structure's size to
m
emset()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-07-11
J
o
han Herland
quickfetch(
)
: Prevent ove
r
fl
o
w of the re
v
-lis
t
comma
n
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Johan Herl
a
nd
git-submodule: ad
d
s
u
pport for
--merge
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-06-03
Joha
n
Herland
Rename submodule
.
<name
>
.
r
e
b
a
se
to su
b
module
.
<
name>
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-04-18
J
o
han Herland
Update docs
on be
h
av
i
our of 'co
r
e
.
s
haredRep
o
sitor
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-03-28
J
ohan Herl
a
nd
Move chmod(foo, 0
4
44) into mo
v
e_temp_to_f
i
le()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next