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
checkout: Use remote refspecs when DWIMming tracking branches
2013-04-21
Joh
a
n Herl
a
nd
checkout: U
s
e
remote refspecs when DWIMming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Show
failur
e
t
o
use refspec when DWIMming remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t2024: Add
t
ests verifying current D
W
IM behavior
o
f
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erla
n
d
gi
t
sy
m
bolic-ref --delete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
F
i
x
f
ai
l
u
r
e
t
o delete a
pack
e
d
r
ef
t
h
r
o
ugh a
s
ym
r
ef
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
a
n
Herl
a
n
d
t1400-update-ref: Add test
v
erifyin
g
bug wit
h
symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an Herland
notes
-
merge:
D
o
n't remo
v
e
.
g
i
t/NOTES_MERG
E
_WO
R
KTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Herland
notes-merge: u
s
e
o
p
e
ndir/r
e
addir i
n
s
tead 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 Herland
t3310: illustra
t
e failure to "
n
otes mer
g
e --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n He
r
land
fast-im
p
ort
:
Fix incorre
c
t fanout level when modifyi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
t9301: Add
2nd
t
e
stcase expos
i
ng bugs
i
n
f
a
st-impor
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an H
e
r
land
t
9
301: Fix tes
t
c
a
se c
o
vering up a bug in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan He
r
l
a
nd
t5400:
F
ix a cou
p
le of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n
He
r
land
M
a
rk
d
i
r
stat error messages for tr
a
n
s
lati
o
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n
H
erland
Impr
o
ve e
r
ror
h
and
l
ing
w
hen pars
i
ng dirstat parameter
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herl
a
nd
New --dirstat=lines mode, doing dirstat a
n
al
y
si
s
based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Al
l
ow
sp
e
c
ifying
-
-dir
s
tat cut-off percen
t
age
as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Add config vari
a
bl
e
f
or spe
c
ify
i
ng def
a
ult --d
i
rstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Refactor --dirs
t
at
p
ars
i
ng; deprecate --c
u
mulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
M
a
ke
--dirst
a
t=0 output director
i
e
s
t
h
at contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Add seve
r
a
l t
e
stcases for
-
-dirstat and fri
e
nds
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: In ca
s
e of renames
,
use target
f
ilena
m
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Her
l
a
n
d
Tea
c
h --dirstat not to compl
e
t
e
ly
ignore rearr
a
nged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
H
erland
--dir
s
tat
-
by-file
:
Make it faster and mor
e
correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirst
a
t
:
Descr
i
b
e non-ob
v
ious differenc
e
s relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
M
a
ke
"
g
i
t not
e
s add" mo
r
e user-frien
d
ly when
there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n Her
l
and
log/
p
rett
y
-options: Document -
-
[no
-
]notes an
d
deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Her
l
and
bran
c
h/ch
e
c
k
out --track: Ensure that u
p
stream branc
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan
Her
l
and
push
.
d
e
fa
u
l
t: Ren
a
me
'
trackin
g
' to
'
upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
Provide
'
git
mer
g
e --abort' as a synonym to 'git r
e
set
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
cmd_m
e
rge(): Parse options before checki
n
g MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
r
ov
i
de 'git n
o
t
e
s get
-
ref
'
to
e
asily retrieve
c
u
r
rent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
git n
o
te
s
merge:
Add testc
a
ses
f
or merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge: Add anot
h
er auto-resolvin
g
st
r
ategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git no
t
es merge:
--commit shoul
d
fail if und
e
rlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
g
i
t not
e
s merge
:
List conflic
t
in
g
notes in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
g
it notes merge:
Manual conf
l
i
c
t resolution, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git no
t
es merge: Ma
n
u
a
l
co
n
flict resol
u
t
i
o
n, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Documentation: P
r
elim
i
nary d
o
cs on 'git
no
t
es
merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rl
a
n
d
gi
t
notes merge: Add automatic conflict resolv
e
rs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
gi
t
n
o
tes merge:
Handle r
e
al,
non
-
conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
l
a
nd
buil
t
in/not
e
s
.
c: Refactor creation o
f
n
o
te
s
commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes
m
erge: Initial im
p
lemen
t
at
i
on handling trivi
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
builtin/notes
.
c: Split notes r
e
f DWI
M
m
e
ry
i
nto
a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
notes
.
c: U
s
e two newlines (instead of one) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
(trivial) t3303: Inde
n
t wit
h
tabs inst
e
ad of s
p
aces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
not
e
s
.
h/c: Propagate comb
i
n
e_notes_fn
re
t
urn
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
h/c
:
Allow combine_notes functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
notes
.
c: Reorder functi
o
n
s in pr
e
p
a
ration for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herl
a
nd
notes
.
h: Make
d
efa
u
lt_notes_r
e
f
(
) a
v
ailable in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
trivial) no
t
es
.
h:
Minor d
o
cumentation fixes to copy_no
t
es()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
n
o
tes
.
c: He
x
if
y
S
H
A1
in die() message fro
m
i
nit_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan
H
e
r
l
a
n
d
notes
:
Do
n
't creat
e
(emp
t
y)
c
ommit when removi
n
g
n
on
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herla
n
d
Enable cus
t
om scheme
s
for co
l
u
mn colors in the graph A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make g
r
a
p
h_
n
e
x
t
_li
n
e()
availab
l
e in the graph
.
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an H
e
rland
revisi
o
n: Turn
o
ff h
i
stor
y
simplific
a
tion in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
revision: Fix typo in --ancestry-path
er
r
o
r
m
essage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
an H
e
rland
Document
a
tion/re
v
-list-options
.
txt: E
x
plain --a
n
c
e
stry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
D
o
cumenta
t
i
o
n
/rev-list-opt
i
ons
.
txt: Fix
missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
d
i
f
f
.
c: Ensu
r
e "index
$
fro
m
.
.
$to
"
line contains unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Joha
n
Her
l
and
bu
i
ltin-not
e
s: Minor (mostly pa
r
se_options-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an
Herla
n
d
sub
m
odule sum
m
ary: Don't b
a
rf when invoked i
n
an emp
t
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
a
nd
builtin
-
not
e
s:
A
dd "co
p
y" subcommand for copying
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-n
o
t
e
s: Mi
s
c
.
refactorin
g
o
f
argc
and
exi
t
v
a
lue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin
-
notes: Add -
c
/-C options
for reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: Refactor handling of -F
o
p
ti
o
n to
a
l
l
o
w
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Depre
c
ate the -m/-F
o
ptions for "
g
it
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
uilt
i
n-not
e
s:
Add "append" subcommand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-n
o
tes
:
Add "
a
dd" subc
o
m
m
and for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
l
t
in-notes
:
Add --message/
-
-file aliases for
-
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
ote
s
:
Add "list" subcomma
n
d for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
Documentation
:
Gen
e
ralize
git-notes docs to
'
objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
builtin-notes: Add "prune"
s
u
bcommand for
r
e
m
oving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: prune_
n
otes
(
)
:
Prune
n
otes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
t
3
305: Verify th
a
t removing notes triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
b
u
iltin-notes: Add "remove"
s
ubc
o
mmand for removi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach builtin-notes to remove emp
t
y notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
Teach not
e
s code to prop
e
rl
y
pr
e
serve no
n
-notes i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305: Veri
f
y that
adding many notes with git-note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t33
0
1: Ver
i
fy successful annotation of non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-
i
f
y git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refact
o
r
n
otes concat
e
nation i
n
to
a
fl
e
xible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
t
e
s
A
P
I: Al
l
ow mul
t
iple c
o
ncurrent n
o
tes tree
s
w
ith
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s A
P
I: write_no
t
es_
t
ree(): St
o
re
t
he
notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
Notes API:
f
o
r_each_note(): Traverse the ent
i
re notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API: get_note()
:
R
eturn t
h
e note annotating th
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
t
es API: rem
o
ve_not
e
(
)
:
Remov
e
n
o
te obje
c
ts from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: add_note(
)
: Add n
o
te
o
b
jects to the internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Not
e
s API: in
i
t_notes(): Initia
l
iz
e
the notes
t
ree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
Add tests for check
i
ng correct handli
n
g
of $GIT_NOTES
_
REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
Notes API: get_commit_notes() -> f
o
r
m
at_note() +
r
emove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
a
n
d
Minor cosmetic fixes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
J
o
han Herland
builtin-config: F
i
x crash when using "-f
<r
e
lative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
A
d
d more t
e
s
tca
s
es to test
f
ast-import of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan H
e
rland
Ren
a
me t9301 t
o
t9350, to make
room
for more f
a
st-
i
mp
o
rt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-import: Prop
e
r not
e
s tree manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herla
n
d
Fix crasher on e
n
coun
t
ering SHA1-like no
n
-note in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
an
H
e
rland
Bas
i
c
b
u
ild infrastructure fo
r
Python s
c
ripts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add selftests ver
i
fy
i
ng concatenation o
f
m
u
ltiple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan He
r
land
Refactor
not
e
s c
o
de
t
o conc
a
tenate
m
ultiple no
t
es a
n
n
otatin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next