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.0.2
2012-10-21
J
o
han Herland
Fix failure to delete a packed ref through a sym
r
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herlan
d
t1400-update-ref:
Add test
verifying bug
wit
h
s
y
mrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
H
e
rl
a
n
d
note
s
-
m
erge: Don
'
t remove
.
git/NO
T
ES_MERGE_W
O
RKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
n
o
tes-merge: use
o
p
e
ndir/readdir inst
e
ad 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
J
ohan He
r
l
and
t3310: illustrate failure to "notes merge
--
c
o
m
m
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fa
s
t-
i
mport: F
i
x incorrect fan
o
ut level
w
h
en
m
od
i
fy
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
ha
n
Herl
a
n
d
t
9301
:
Add 2nd testca
s
e expos
i
ng bugs in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
t9
3
01: Fix testcas
e
covering
u
p a
b
u
g
in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a coup
l
e
o
f
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n He
r
land
Mark dirstat error me
s
sages
f
or translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Impr
o
ve error handling when p
a
rsing dirs
t
at parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
New --dirst
a
t=lines mode, doing dirs
t
at analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Allow specifying --di
r
stat
c
ut-of
f
pe
r
c
e
n
tage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
Add
config variable for specif
y
ing default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rla
n
d
Refactor --dirstat parsing; depre
c
ate --cu
m
ulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
Herland
Make --
d
irstat=0 output directo
r
ies that con
t
ribut
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
H
er
l
a
nd
Add several testcase
s
for
--dirsta
t
and
friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: In case
of renames
,
use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han He
r
l
a
nd
Teach
-
-dirstat not t
o
completely
ignore rearran
g
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
-
-d
i
rst
a
t-b
y
-file: Ma
k
e
it
faster and mor
e
corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herl
a
nd
--dirstat: Des
c
ribe non-obvi
o
us differences rel
a
t
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make
"
git
note
s
add" more user-friendly w
h
en there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
Herland
log
/
pr
e
tty-options: Documen
t
--[no-]note
s
a
n
d
depre
c
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herlan
d
branch/ch
e
ckou
t
--track: Ensure that
u
ps
t
re
a
m
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herland
p
ush
.
default
:
Ren
a
me '
t
rack
i
ng' to '
u
pstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
P
rovide
'gi
t
merge --abort' as
a syn
o
nym to
'git
reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
cmd_merge(
)
:
Parse op
t
ions before checking MERGE_HEA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Provide
'git notes get-ref' t
o
e
asily retrieve curr
e
nt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git n
o
t
es mer
g
e
:
Ad
d
testcas
e
s for me
r
gin
g
notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
i
t no
t
es m
e
rge: Add an
o
ther auto-r
e
solving
s
tra
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge:
--
c
omm
i
t should
fail if
underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
mer
g
e: List
confli
c
ting
notes
in not
e
s
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
no
t
es merg
e
: Ma
n
ual c
o
nflict
r
es
o
l
ution, p
a
rt 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
i
t n
o
tes merge
:
Manual
c
onflict res
o
lution, p
a
rt 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herlan
d
Doc
u
m
entat
i
on: Preliminary docs on '
g
it notes m
e
rg
e
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add automat
i
c conflict resolve
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git no
t
es
m
erge:
Hand
l
e
real, non
-
co
n
flicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herland
b
uiltin/notes
.
c: Refactor creation of notes com
m
i
t
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes me
r
ge: Initial implementati
o
n handling tri
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
builtin
/
notes
.
c: S
p
lit note
s
ref
D
W
I
M
m
ery
i
nt
o
a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
n
ot
e
s
.
c
:
U
se two newlines (ins
t
ead of one
)
when concate
n
atin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3303: Inden
t
with ta
b
s ins
t
e
a
d
o
f
s
paces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herl
a
nd
n
o
t
e
s
.
h/c:
P
ropagate combine_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
no
t
es
.
h/c: Allow combine_notes functions to re
m
ove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
c: Reorder functions in prepa
r
ation
f
or next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h: Make def
a
ult
_
note
s
_ref()
avai
l
a
ble in
note
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(triv
i
a
l) notes
.
h
:
M
i
n
o
r do
c
um
e
ntation fixes
t
o copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c
:
Hexify SHA1 in die(
)
m
e
ss
a
ge f
r
om i
n
it_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
Herland
notes: Do
n
't create (empty) commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
ohan
Her
l
and
Enable custom
schemes for col
u
mn colors in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_next_line()
a
vailable in the graph
.
h AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: T
u
rn off hi
s
tory
s
implifica
t
ion
i
n -
-
ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
e
rlan
d
revi
s
ion: Fix typo in
-
-ancest
r
y
-pa
t
h e
r
ror messag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documenta
t
ion
/
rev-list-option
s
.
tx
t
:
Explain
-
-ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documen
t
at
i
on/rev-l
i
s
t-op
t
ions
.
txt:
F
i
x
missing
l
ine
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
han
Herland
di
f
f
.
c: Ensure "index $
f
r
om
.
.
$to" line contains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
buil
t
in
-
n
otes: Minor (m
o
stly parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herl
a
nd
sub
m
odule summary: Don't barf when invoked in
a
n em
p
ty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es: Add "copy
"
subco
m
man
d
for c
o
pying note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
lt
i
n-notes: Misc
.
ref
a
cto
r
ing
o
f a
r
gc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
bui
l
tin-notes:
A
dd
-c/-C o
p
t
i
ons for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
builtin-notes: Refactor hand
l
i
n
g
o
f -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
b
uiltin-notes:
D
eprec
a
te the -m/-F opti
o
ns for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rla
n
d
built
i
n-notes: Add
"
append" subc
o
mma
n
d for
appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-note
s
: Add
"
add" subcommand f
o
r a
d
ding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
b
uiltin-notes:
A
dd
-
-
message
/
-
-
fil
e
aliases for
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builti
n
-notes: Add "l
i
s
t
" subco
m
man
d
for list
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Docum
e
ntation: Gen
e
rali
z
e git
-
notes docs to 'objec
t
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
ti
n
-notes: Add "p
r
une
"
subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: pr
u
ne_notes(): Prune notes that
b
elong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
t3305: Verify that removin
g
notes trig
g
e
r
s
autom
a
tic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add "remove" subcommand for removi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach builtin-
n
otes to remo
v
e
e
mpty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes code to proper
l
y
pres
e
rve
n
o
n-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t33
0
5: V
e
r
i
fy that addi
n
g
many notes
w
ith git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t3301: Verif
y
succes
s
fu
l
anno
t
ation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Built
i
n-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
Ref
a
ctor notes
concatenation into
a
flexible interf
a
ce
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Not
e
s API: Allow multiple concurre
n
t no
t
es trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
P
I
: write_notes_tree(): Store th
e
notes tr
e
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
Notes API:
fo
r
_each_note(): T
r
averse
t
he entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
Notes
AP
I
: get_note(): Ret
u
rn the
note ann
o
tat
i
ng the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
No
t
es AP
I
: remove_note(): Remove note o
b
ject
s
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Notes
API:
a
d
d_note
(
)
: Add
note obje
c
ts to the intern
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rl
a
nd
Notes API: init_notes():
Initialize the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
A
dd te
s
ts f
o
r checking correct
h
a
ndling of $
G
IT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API:
g
et_commi
t
_n
o
t
e
s() -
>
format_
n
ote()
+ remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Min
o
r cosmetic fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan
Herland
builtin-config:
F
ix cra
s
h wh
e
n u
s
ing "-f <relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
A
d
d
more test
c
ases t
o
test
f
a
st-im
p
o
r
t of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an H
e
rland
R
ename t9301 to
t
9350,
t
o
m
a
ke room for
more fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Her
l
an
d
fast
-
import: Pro
p
er
n
otes
t
ree
m
a
nipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n
Herland
Fix crasher
on en
c
o
u
ntering SHA1-like non-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan H
e
r
land
Basic b
u
ild infrastructure for
Pyth
o
n scrip
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Add
se
l
ftests verifying concatenati
o
n of mu
l
tiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han
H
e
rland
Refactor notes code
t
o concatenate mul
t
i
p
le notes a
n
notating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Her
l
and
A
dd
s
elftes
t
s
verifying that we can pa
r
se notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Tea
c
h the notes lookup code to parse not
e
s
t
rees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Teac
h
note
s
code to
free its
internal dat
a
structu
r
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add fl
a
gs to
get_commit_notes()
to control
t
he format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next