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
t3200: Add test demonstrating minor regression in 41c21f2
2013-09-09
Johan H
e
rland
t3200: Add test demonstrating minor regression
in 4
1
c21f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rland
Re
f
er to branch
.
<name>
.
rem
o
te/merge
when d
o
cu
m
enting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
lan
d
t3200:
M
inor f
i
x w
h
en prep
a
ring for tra
c
king failure
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herland
t2024: Fix &
&
-
c
hainin
g
and a
c
ouple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
g
lossary: Upda
t
e
and rephra
s
e th
e
def
i
nition
o
f
a remo
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
r
l
and
branc
h
.
c:
V
alidate
t
racking br
a
nches
w
ith refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
He
r
land
t9114
.
2
:
Don't us
e
--t
r
ack option
agai
n
st "svn
-
remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han H
e
rland
t
72
0
1
.
24: Ad
d
refspec to keep --t
r
ack working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t3200
.
39: t
r
acking setup should fail if
t
here is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
checkout:
Use remote refspecs when D
W
I
M
ming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
2024: Show failure to use refspec when DW
I
Mming remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t2024: Add tests verifying c
u
rrent
D
WIM
behavi
o
r of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herlan
d
git sy
m
bolic-ref -
-
delete $
s
y
m
ref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herland
Fix failure to de
l
e
t
e a pac
k
e
d
r
e
f
t
h
rough
a
symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rland
t1400-update-ref:
Add test
v
e
rifying bug with sym
r
efs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
notes-
m
er
g
e: Don't remove
.
git/NOTES_
M
ERGE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge
:
use opendir/rea
d
dir inste
a
d
of using
r
e
a
d_dir
e
c
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herland
t3
3
10: illustrate fail
u
re to
"
note
s
mer
g
e --
c
ommit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an
Herland
fast-
i
mport: Fix incorrect fanout level when modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2
n
d testcase expos
i
ng bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
t9301: Fix testc
a
se
covering
u
p a bu
g
i
n f
a
st-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t54
0
0: Fix a co
u
ple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dirstat error
m
essag
e
s
for translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Improve error
h
andling when
p
ar
s
in
g
dirstat
p
arameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
New
-
-dirst
a
t=li
n
es mode, doing dirstat analysis
base
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Allow spe
c
if
y
i
ng --dirstat cut
-
o
ff percentage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Add config variabl
e
f
o
r specifying
default --
d
i
r
sta
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refa
c
to
r
--dirstat pars
i
ng; deprecate --cum
u
lative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
M
a
ke --dirsta
t
=0 output dir
e
ctor
i
es that contri
b
u
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
er
l
and
Add several t
e
stcases for --dirstat and
f
riends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--d
i
rst
a
t: In case of
r
e
names, use targ
e
t f
i
lename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
Teach --dirstat not
to c
o
mpletely
i
gnore
r
e
a
rranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
He
r
l
a
nd
-
-
d
i
rst
a
t-
b
y-file
:
Make
it fas
t
er
and
m
o
r
e
c
o
rrect
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
--dirstat: Describe non
-
o
bvious d
i
f
ferences relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "
g
it notes add" mo
r
e u
s
er-friendly when t
h
ere
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty-options: Document --[no-]no
t
es and dep
r
ecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
ohan He
r
land
branch/checkout
--
t
rack: En
s
ure that upstr
e
am b
r
a
nch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan
H
e
r
land
push
.
default: R
e
name 'trac
k
ing'
to 'ups
t
ream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Provide 'git merge --a
b
o
r
t'
a
s a sy
n
onym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
cm
d
_
merge(): Parse options befo
r
e c
h
e
c
king MERGE_HEA
D
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erla
n
d
Pro
v
i
de '
g
it notes
g
et-
r
ef' t
o
e
asily retrieve cu
r
re
n
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge
:
Add testcas
e
s
fo
r
m
erging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merge: A
d
d another a
u
to-resolvin
g
strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git not
e
s
m
er
g
e: --comm
i
t
s
hould fail i
f
underlyin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge: List conflicting n
o
tes i
n
notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
g
i
t
n
otes merge:
M
a
n
ual co
n
flict resolution, part 2
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
git notes merge: Manual conflic
t
resolution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation: Preliminary docs on 'git
n
otes me
r
ge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes merge: Add
au
t
o
matic conf
l
ict re
s
olvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
it not
e
s merg
e
:
H
andle r
e
al, non-con
f
lict
i
n
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
built
i
n/note
s
.
c: Refactor
creation of notes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
notes merge:
Initial implementation handl
i
ng t
r
i
vial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Her
l
a
n
d
bu
i
ltin/notes
.
c: Split not
e
s
r
ef DWIMmery into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
n
o
te
s
.
c: Use two newl
i
ne
s
(instead of one) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
(trivial)
t
3303: Inde
n
t with tabs instead of spac
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
h
/c: Propagat
e
comb
i
n
e_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/
c
:
Allow co
m
b
ine_n
o
t
es functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
ot
e
s
.
c
: Reorder funct
i
ons in preparation for n
e
x
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
h: Make
d
ef
a
ult_n
o
tes_ref() available in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herl
a
nd
(trivi
a
l
)
n
otes
.
h: Minor
d
ocumentation f
i
xes to
c
o
p
y
_note
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
n
o
tes
.
c
:
Hexify SH
A
1 in die() m
e
ssage from init_no
t
es()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan
He
r
l
a
n
d
n
ote
s
: Don't create (empty) commit when removin
g
non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable cus
t
om schemes
f
o
r
c
o
lum
n
colors in the graph
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Make graph_next_
l
ine()
available in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
l
and
revisio
n
: Turn off his
t
ory sim
p
lif
i
c
at
i
on in --anc
e
str
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix typo in --anc
e
stry
-
path error me
s
sage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentati
o
n/r
e
v
-list-options
.
txt: Explain --anc
e
stry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
Documentation/re
v
-l
i
s
t
-options
.
txt: Fix missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
dif
f
.
c:
E
nsure "index $from
.
.
$to" line contains unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Joha
n
H
e
rland
builti
n
-notes
:
Minor (
m
ostly par
s
e_options-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
ohan
H
erla
n
d
su
b
module summary: Don
'
t ba
r
f when
i
nvoked i
n
an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes:
A
dd
"copy" subcommand f
o
r copying note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
b
u
iltin-notes: M
i
sc
.
r
e
f
a
ctoring of
argc and exit v
a
lue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
b
u
i
ltin-notes: Add -c/-C options for re
u
sing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
b
uiltin-not
e
s:
Refactor handling
of -F
optio
n
to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Deprecate the
-m/-F options for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
builtin-notes:
Add "append" subcommand for
a
ppending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
b
uiltin-notes: A
d
d "add" subcommand for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herla
n
d
bu
i
l
t
in
-
notes: Add --message/--file a
l
iases for -
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
builtin-notes: Add "li
s
t"
s
ubcom
m
and f
o
r listing n
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Documentation
:
G
en
e
ralize git-no
t
es doc
s
to '
o
bject
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes: Add
"
p
ru
n
e" subco
m
ma
n
d fo
r
removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es API: prune_notes
(
): P
r
une
notes tha
t
belong t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
t3305:
Verif
y
that rem
o
ving notes trig
g
ers auto
m
atic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
bu
i
ltin-note
s
: Add "r
e
move" subcommand for
r
e
moving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach b
u
iltin
-
n
o
tes to remove empty not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
T
each note
s
code to properly preserve non-notes
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
t3305
:
Verify that adding man
y
notes with git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
t3301: Verify succe
s
sful
annotatio
n
of non-comm
i
ts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Builtin-i
f
y
git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Refactor notes c
o
nca
t
enation into a flexible
i
nterfa
c
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Note
s
API: Allow multip
l
e
c
oncur
r
ent n
o
te
s
trees
with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes
A
PI: write_notes_tr
e
e(
)
:
Store the notes
t
re
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
P
I:
f
or
_
eac
h
_not
e
()
:
Traverse the
e
ntir
e
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
N
ot
e
s API: get_note():
R
eturn the not
e
an
n
ot
a
ting the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes
AP
I
:
r
e
move
_
n
ote
(
): Remove
note obje
c
ts fr
o
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: add_no
t
e(): Add note objects
t
o
t
he
internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
N
otes API: init_
n
otes
(
): Initi
a
lize the notes
tre
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Add tests for checkin
g
c
orrect handli
n
g of $
G
IT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_commit_note
s
() -> f
o
r
ma
t
_no
t
e() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next