repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.8.1-rc0
2012-10-21
Johan Herland
git
symbolic-ref --d
e
lete
$
symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herland
F
ix fail
u
re
to delete a p
a
ck
e
d
re
f
through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n
H
erland
t1400-update-
r
e
f: Add test verifying bug
with
s
ymr
e
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herland
no
t
es-me
r
ge:
D
o
n
't remove
.
git/NOTES_
M
ERGE_
W
ORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
n
o
t
es-me
r
ge: use opendir/readdi
r
instead of using read
_
direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an Herland
t3310:
illustrate failure
t
o
"notes mer
g
e --
c
ommit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast-imp
o
rt: Fi
x
incorrect fa
n
ou
t
level when modifyi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301
:
Add 2n
d
testcase exposing bugs in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan H
e
rlan
d
t9301: Fix test
c
ase covering up
a bug in
f
a
s
t-
i
m
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herl
a
nd
t540
0
: Fix a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Ma
r
k dirstat error mess
a
ges
f
or tran
s
latio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n
Herland
Improve error handl
i
ng wh
e
n parsing dirstat
para
m
eters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New
-
-dirs
t
at=li
n
es mode,
doing
dirstat analysis b
a
sed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Allow speci
f
y
i
n
g
--d
i
r
stat
c
ut-off perce
n
tage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Add config
var
i
able
f
or sp
e
cifyin
g
defa
u
lt --di
r
stat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Refactor --dirstat
p
arsing; deprecate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make
-
-
d
irstat=0 output directori
e
s that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add severa
l
testcases f
o
r --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
an Herland
--di
r
stat: In case of r
e
names, us
e
targe
t
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Her
l
a
nd
Te
a
ch --dirstat not to
complete
l
y
ignore r
e
ar
r
anged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-dirstat-by-file
:
Make
i
t faster a
n
d
more
c
orr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe non-obvio
u
s diffe
r
ences re
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an Herland
Make
"
git no
t
es add" more user-frien
d
ly
w
hen th
e
re
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
log/pretty-options:
Docume
n
t --[no-]notes and
d
e
prec
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
b
ran
c
h/checkout --track: E
n
sure that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
pus
h
.
default: Re
n
ame 'tracking' to 'upstre
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
r
lan
d
Provid
e
'git merge
-
-abor
t
' as a synonym to 'git r
e
set
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
cmd_
m
erg
e
(): Parse
o
ptions before ch
e
cking MERGE
_
HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git note
s
g
e
t-ref'
to easily retrieve curr
e
nt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes merge:
Add
testcases f
o
r
merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
git n
o
tes m
e
rge: Add ano
t
her
a
uto-resolv
i
ng strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herla
n
d
g
it notes merge: --c
o
mmi
t
should
fai
l
i
f
underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
g
i
t n
o
tes merge
:
List confl
i
cting note
s
in notes mer
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge:
M
anua
l
conf
l
ic
t
resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
g
i
t
n
o
tes merge
:
Manual conflict resolution
,
p
a
rt 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docum
e
ntation: Preli
m
i
nary docs on 'git notes
mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add automatic co
n
flict reso
l
ver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes mer
g
e:
H
a
ndle real, non-co
n
flic
t
ing not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
builtin/
n
ot
e
s
.
c
:
Refactor cr
e
a
ti
o
n o
f
notes c
o
m
m
its
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: Ini
t
ial im
p
lementation handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
H
erlan
d
builtin/notes
.
c
:
Split not
e
s ref DWIM
m
ery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
an
d
notes
.
c: Use two n
e
wline
s
(i
n
s
tead of one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
(trivial) t33
0
3: I
n
dent
w
ith tabs instead of s
p
aces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
h/c: Propagat
e
com
b
ine_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow combin
e
_not
e
s
func
t
ions to r
e
move
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
n
otes
.
c
:
Reorder fun
c
tions in pr
e
pa
r
ation for
n
ext
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
h: Make default_n
o
te
s
_r
e
f() available
in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
t
rivial) notes
.
h: Minor
documentati
o
n
f
ixes to c
o
py_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
no
t
es
.
c: Hexif
y
SHA1
i
n die
(
) message from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don't
creat
e
(e
m
pty)
c
omm
i
t wh
e
n r
e
m
o
v
ing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Her
l
and
Enable custo
m
schem
e
s for column co
l
ors
i
n th
e
grap
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
ohan Herl
a
nd
Make graph_ne
x
t_line() a
v
ailable in the graph
.
h
AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n
Herland
r
evision: Tu
r
n off histor
y
sim
p
lificat
i
o
n
i
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
r
l
and
revisio
n
:
Fix typo in --an
c
e
s
try-path error me
s
s
a
ge
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
n
d
Documentatio
n
/
rev-list-
o
ptions
.
txt: Explain --a
n
cestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Document
a
tion/r
e
v-list-options
.
txt:
F
ix
m
i
ssing li
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: En
s
ur
e
"index
$
fr
o
m
.
.
$to" l
i
ne
c
ontains unamb
i
guous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
oha
n
H
e
rlan
d
builtin-n
o
tes: Min
o
r (m
o
stl
y
parse_option
s
-rela
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan H
e
rland
submodul
e
summary
:
Don't barf
when invoke
d
in
a
n empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes: Add
"
co
p
y" subcomma
n
d f
o
r cop
y
ing no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
bui
l
tin-notes: Misc
.
refac
t
oring
of argc and
exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
bui
l
tin-notes
:
Add
-
c/-C options
f
or reusing not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes: Refactor h
a
ndling
o
f -F option
to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
bu
i
ltin-notes: Deprecate the -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
r
land
b
uiltin-notes: Add "appen
d
" subcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
builtin-notes: Add "add" subcommand for ad
d
ing not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add --message/--file
aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add "list" s
u
bco
m
mand fo
r
li
s
t
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Doc
u
mentation
:
Generalize git-notes docs to 'ob
j
ects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
bu
i
ltin-notes: Add "pr
u
n
e
"
subcomm
a
nd for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API: prune_n
o
tes(
)
: Prune
notes
that belo
n
g to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t3305: Ver
i
fy
tha
t
r
e
movi
n
g
notes tri
g
gers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes
:
Add "
r
emove" subcommand for r
e
m
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach builtin-notes to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
Teach not
e
s
c
ode to
proper
l
y preser
v
e non-notes
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3305:
Verify
t
h
a
t adding man
y
notes wit
h
gi
t
-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
t3301: Ver
i
fy
s
uccess
f
ul an
n
o
t
at
i
o
n
of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Builtin-ify
git-
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Refactor
no
t
es concatenation into a flexible
i
nterface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
Notes API: Allow
m
u
l
t
iple concurrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
write_notes_tree(): Store the
notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: fo
r
_each_note(
)
: Tr
a
ver
s
e the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes AP
I
: get_note(): R
e
t
u
rn the no
t
e an
n
otating th
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
N
o
t
e
s API: remove_note(): Remo
v
e note
obje
c
ts
f
rom
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
a
dd_not
e
(
)
: Add note objects to the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
n
d
Notes AP
I
:
i
nit_notes(): I
n
itialize t
h
e notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
A
d
d tests
f
or chec
k
i
n
g c
o
r
r
ect handlin
g
of $GIT_NOT
E
S
_
REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
g
et_
c
ommit_notes() ->
f
ormat_no
t
e() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Min
o
r cos
m
etic fixes to no
t
es
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an Herland
builtin-config: Fix
cras
h
when
usi
n
g "-f <re
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herla
n
d
A
dd more
t
estcases to
t
est
fa
s
t-i
m
p
ort of n
o
te
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan He
r
land
Re
n
a
me t930
1
t
o t93
5
0, to ma
k
e room for more
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herland
fast-
i
mport: P
r
ope
r
notes t
r
ee manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
J
ohan Herland
Fix crash
e
r
on
e
ncounteri
n
g
S
HA1-like non-n
o
te in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
a
n
H
e
rlan
d
Ba
s
ic buil
d
in
f
r
astru
c
tur
e
for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herl
a
nd
Add selftests verifying concatenation
o
f m
u
ltip
l
e notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herla
n
d
Refactor notes co
d
e
to conc
a
t
e
n
a
te mu
l
t
i
ple no
t
es annotating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add selftests verify
i
n
g
that we can parse not
e
s trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach the notes
l
o
okup code to parse notes tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan
Herland
Teach no
t
es code to
f
r
ee its in
t
e
r
nal da
t
a structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next