repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sl/readme-gplv2' into maint
2012-10-21
J
ohan Herland
Fix failure to
delete a packed
r
e
f through
a symre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herland
t1400-update-
r
ef: Ad
d
test verifying bu
g
with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an
H
erland
n
o
tes
-
merge: Don't
remove
.
g
i
t
/
NOTES_
M
ERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han He
r
l
and
notes-merge: use opendir/r
e
addir 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
Johan Herl
a
nd
t331
0
: illustrate
fail
u
re to "n
o
tes merge --commi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
la
n
d
fast-import: Fix incorrect f
a
nout level wh
e
n modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9
301: Add 2nd t
e
st
c
ase exposing bugs
i
n
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
t9301
:
Fix testcase covering
up a bu
g
in f
a
st-im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rland
t
5
400: Fix a
co
u
ple of typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
la
n
d
Mark dirstat error m
e
ssages for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Improve error handling when
p
arsing
d
irst
a
t parame
t
ers
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
N
e
w
--dirstat=l
i
nes
m
ode, doin
g
dirstat ana
l
ys
i
s b
a
sed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
ha
n
Herl
a
n
d
Allow
specifying --dirstat cut-off percentage as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
Herland
Ad
d
c
onfig variable f
o
r s
p
ecifying
d
efa
u
lt --
d
irstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
R
e
fac
t
or --dirs
t
at pa
r
sing; d
e
precate
-
-cum
u
lative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Make
--dirstat=
0
o
utput directories t
h
at
con
t
ri
b
ute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add sev
e
ral te
s
tcases for --dirstat
a
nd fri
e
nds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han He
r
land
--dirstat
:
In cas
e
of ren
a
me
s
, use t
a
rget
fil
e
n
a
me
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Her
l
and
Teach --dirs
t
at not to completely igno
r
e rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--dir
s
t
at-b
y
-f
i
l
e: M
a
ke it f
a
ster and more
correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
--dirstat: De
s
cribe
non-obviou
s
dif
f
erences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
H
erland
Make "git
notes add"
more use
r
-frie
n
dly wh
e
n there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/prett
y
-op
t
ions: Do
c
ument --[no-]notes
a
nd deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
Herland
br
a
nch/chec
k
out --track: Ensure that upstream
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herlan
d
p
u
s
h
.
de
f
aul
t
:
Rename 'tracking' to
'
u
pstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Pr
o
vi
d
e 'git merge --abort' as a synonym t
o
'git r
e
se
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_me
r
ge(): Parse options before checking MERGE_HE
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Provide 'git no
t
es get-ref' to easily retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
n
otes merge: Add testcases for
mer
g
ing notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rlan
d
git no
t
es merge
:
Add an
o
ther auto-resolving stra
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git
n
otes m
e
rge: --
c
ommi
t
s
h
oul
d
fail if under
l
yin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
H
erland
git notes
m
e
r
ge: List confl
i
ct
i
ng
n
o
t
es
in not
e
s
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merg
e
: Manual conflict resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git
notes me
r
ge: Manual conflict resolution
,
part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Her
l
an
d
Documentation:
Pr
e
limi
n
ary
doc
s
on 'git n
o
t
e
s merge
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git
notes merge: Ad
d
aut
o
ma
t
i
c
conflict reso
l
vers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: Handl
e
real, non-confli
c
ting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
uilt
i
n/notes
.
c: Refac
t
or cr
e
at
i
on of notes
comm
i
t
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merge:
Initial implemen
t
ation handling trivi
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
an
d
builtin/notes
.
c:
S
plit notes ref DWIMmery in
t
o a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
es
.
c: Use two n
e
w
lines
(instead
o
f one) wh
e
n concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rlan
d
(t
r
i
v
ial) t3303: Ind
e
nt wit
h
t
abs instead of spa
c
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
n
otes
.
h/c: Propagate co
m
bine
_
notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
h/c: Allow combine_notes functions t
o
rem
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: R
e
orde
r
funct
i
ons i
n
prep
a
r
a
tion for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herl
a
nd
n
o
tes
.
h
: Make defa
u
lt_notes_r
e
f() av
a
i
lable in n
o
te
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
H
erla
n
d
(triv
i
a
l
) n
o
tes
.
h: Minor
docume
n
t
a
tion fixes
t
o copy_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n H
e
rland
note
s
.
c: H
e
xify
SH
A
1 in di
e
() message from init_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan
H
erland
notes: Don't
c
reate (emp
t
y) commit whe
n
re
m
oving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han Herland
Enable custom
s
che
m
es for column co
l
ors in the
g
raph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
e
rland
Make grap
h
_next_line() a
v
ailab
l
e i
n
the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han He
r
land
revisio
n
: Turn off
history s
i
mplifica
t
ion in
-
-
ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
rev
i
sion:
Fix typo in --ancestry
-
path error me
s
sage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentat
i
on/rev
-
l
is
t
-opti
o
ns
.
txt: Exp
l
ain
-
-ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Documentatio
n
/rev-list-o
p
tions
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
d
i
ff
.
c: Ensure "index $from
.
.
$to"
line
contain
s
unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan
H
e
rland
built
i
n-notes: Mino
r
(mostly parse_op
t
ion
s
-rela
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
s
u
bmodule su
m
ma
r
y: Don't barf
when invoked in an empt
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add "copy
"
sub
c
ommand for copying
n
ot
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
b
uil
t
in
-
note
s
: Misc
.
refactoring of
a
rgc a
n
d
e
xit va
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
builtin-notes: Add -c
/
-
C
options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
n
otes: Refa
c
t
o
r handling of -F option to
a
ll
o
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
buil
t
in-notes: Deprecate the -
m
/
-
F options
f
o
r
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add
"
append" subcomma
n
d f
o
r app
e
nding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
bu
i
ltin-n
o
tes: Add "add" sub
c
ommand for adding no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-
n
o
tes:
A
dd --mes
s
a
g
e/-
-
file aliases for -
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Ad
d
"list"
s
ubcomma
n
d fo
r
listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
D
o
cumentation: Gener
a
li
z
e git-notes docs
t
o '
o
bjects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: A
d
d "prune" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
land
Notes API: prune_notes(): Prune n
o
t
es that belong
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify tha
t
re
m
oving
notes trigg
e
rs auto
m
ati
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
builti
n
-
n
otes: A
d
d
"
rem
o
ve"
s
ubcommand
f
or remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
l
a
nd
Teach builtin-n
o
tes to remov
e
em
p
ty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
T
e
ach not
e
s co
d
e
t
o properly pr
e
serve non-notes
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t330
5
:
Verify th
a
t adding m
a
ny notes with git-
n
ote
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t
3301: Verify successful annotation of
non-
c
ommits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Built
i
n-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n H
e
rland
R
e
facto
r
notes
concaten
a
tion in
t
o a
flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
Notes API: Al
l
ow multiple concurrent
notes trees
w
ith
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
Notes
A
PI: w
r
i
t
e_notes_
t
r
ee
(
):
S
tore the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
N
o
t
e
s AP
I
: for_e
a
ch_not
e
(
): Trave
r
se the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
N
otes API: g
e
t_note(): Return th
e
no
t
e anno
t
ating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: remo
v
e
_
note(
)
: Remove
n
o
te 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
not
e
objects to the inter
n
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
ote
s
API: init_notes(): Initialize the
notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
Add tests f
o
r ch
e
c
k
ing
c
orrect handl
i
ng o
f
$
G
IT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: g
e
t_co
m
mit_no
t
es() ->
forma
t
_no
t
e() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Minor cosmetic fixes
to n
o
tes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joh
a
n Herla
n
d
builtin-c
o
nfig: Fix crash when u
s
i
n
g "-f <
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
A
dd
m
o
r
e test
c
ases to test fas
t
-im
p
ort
o
f
n
o
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herlan
d
Rename t9301
t
o t9350, to make room f
o
r more fas
t
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-import:
Pr
o
per n
o
t
es tree manipula
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
F
i
x
crasher
o
n encoun
t
ering SHA1-like
non-n
o
t
e
in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan He
r
land
Basic b
u
i
ld infrastructure for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Her
l
a
n
d
Add self
t
ests veri
f
y
ing c
o
ncatenatio
n
o
f
m
ultiple not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Refactor notes
c
od
e
t
o
concatenate
m
ulti
p
le notes
annotat
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Her
l
and
Add selftes
t
s ver
i
f
y
ing that
w
e can
parse notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n H
e
rland
T
each
t
he
notes lookup co
d
e to pars
e
notes t
r
ees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
e
rland
T
e
ach
n
otes code to free i
t
s intern
a
l data str
u
c
t
ures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
Herl
a
nd
Add flags to get_commit
_
notes() to
con
t
rol
the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next