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
t9114.2: Don't use --track option against "svn-remote"-tracking branches
2013-04-21
Johan Herla
n
d
t9114
.
2: Don
'
t use --tra
c
k o
p
t
i
o
n
agai
n
st "svn-
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t7201
.
2
4
: Add refspec to
k
e
ep -
-
track wo
r
king
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Her
l
and
t
3
20
0
.
39
:
tracking
setup should
f
ail if the
r
e is
n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
oh
a
n
Herland
checkout
:
Us
e
rem
o
te refspecs when DWI
M
ming trac
k
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
oh
a
n He
r
land
t2
0
2
4: Show f
a
ilu
r
e
to use
refsp
e
c
when DWIMmi
n
g remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t
202
4
: Add test
s
verifyi
n
g current DWIM behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erland
gi
t
symb
o
l
i
c-ref --delete $sym
r
ef
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
nd
F
i
x fa
i
lure to del
e
t
e
a packed
r
e
f through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erland
t1400-up
d
ate-ref: Add
t
est verifying
b
ug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-
m
er
g
e
: Don't remove
.
git/NOTES_ME
R
GE_WO
R
K
T
RE
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
ha
n
Herland
notes-merge:
use opendir/readdir inst
e
a
d o
f
using read_di
r
ec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
land
t3310: illustrate fa
i
lure
t
o
"not
e
s merg
e
--c
o
mmit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
fast-import: Fix incorre
c
t fa
n
out
lev
e
l w
h
e
n modify
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t9301: A
d
d 2nd testcase ex
p
osing bugs in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t
9301: Fix
t
estcase c
o
vering up a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rland
t5400: Fix a c
o
uple of
t
ypos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Mark dirst
a
t error messa
g
es for translati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Improve error handling when par
s
i
ng dirst
a
t parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Ne
w
--
d
irstat
=
lines
mode, doing dirstat analy
s
is based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
a
n
d
Allo
w
specifying --dirst
a
t cut-off percentage a
s
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config vari
a
bl
e
for
s
p
ec
i
f
y
ing
de
f
ault --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Ref
a
ctor --di
r
stat par
s
ing; deprecat
e
--
c
um
u
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herla
n
d
Make --dirstat=
0
outp
u
t
directories
t
hat contri
b
ute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Add several testcases fo
r
--dirstat and frien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
Herlan
d
--dirstat:
I
n
case
o
f renames, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dirstat
n
ot to
c
omplete
l
y
i
gnore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an He
r
la
n
d
-
-dir
s
t
at-b
y
-fi
l
e: M
a
ke it faste
r
and more
corre
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
-
-
d
irstat: Describe non-ob
v
ious
d
if
f
er
e
nce
s
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Herland
Make "git no
t
es
add" m
o
r
e
us
e
r-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Herland
log/pretty-o
p
tions: Doc
u
m
e
nt
--[n
o
-
]note
s
and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joh
a
n Herland
b
r
anch/c
h
eckout --track: En
s
ure that upstream branc
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Joha
n
He
r
land
push
.
default: Rename
'
t
racking' t
o
'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Provide
'
gi
t
merge --abort' as a synonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
cmd_merge():
Parse options before checkin
g
M
E
RGE
_
H
E
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git no
t
es get-ref' to e
a
sily
r
etrieve
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herl
a
n
d
gi
t
notes merge: Add testcases for
m
erging not
e
s
t
r
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
git no
t
e
s
merge:
Add another auto-reso
l
ving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes
m
erg
e
: --commit should fail if un
d
erlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes merge: Li
s
t conflict
i
ng no
t
es in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manual
conflict re
s
olution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git notes mer
g
e: M
a
nual conflict re
s
olution, part 1/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Do
c
ument
a
tion:
Pr
e
liminary d
o
cs on
'gi
t
not
e
s merge
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
git notes
m
erg
e
:
Add auto
m
atic co
n
flict resolver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
g
it notes merge: Ha
n
dle real, no
n
-
c
o
nflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
uilt
i
n/notes
.
c
:
Refactor
c
reat
i
on of notes c
o
mmits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git
notes merge: Initial impleme
n
tati
o
n
handl
i
n
g t
r
ivia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
bu
i
lti
n
/notes
.
c: Split
n
otes ref
DWIMme
r
y into a se
p
arate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use
two newlines (instead of one
)
w
hen concat
e
natin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
(trivial) t3303: Indent
with t
a
b
s
instead o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herland
notes
.
h
/
c
:
Pr
o
pag
a
te
c
ombine_n
o
tes_f
n
return
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
h
/c:
Allo
w
c
ombine_notes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
n
otes
.
c: Re
o
rder functions in prepara
t
ion f
o
r ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
h: Make d
e
faul
t
_
notes_ref() available
in note
s
A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
(trivial) notes
.
h:
M
inor documentation fixes to cop
y
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
note
s
.
c: Hexify SHA1 in die() messa
g
e
from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes:
D
on't cr
e
ate (empty) commit when
r
e
m
oving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
E
n
able
c
u
s
tom schemes for column
c
o
lors in the graph
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
erland
Make
graph_next_lin
e
()
a
vailable
i
n the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revision: Tu
r
n
of
f
history sim
p
l
i
f
ication in --ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix t
y
p
o in --anc
e
stry-
p
ath error mes
s
ag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Document
a
tion/rev-list-o
p
tio
n
s
.
txt:
E
x
plain
-
-ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Her
l
and
Docu
m
ent
a
tion/rev-list-options
.
txt: Fix mis
s
ing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herlan
d
diff
.
c:
Ensur
e
"index $from
.
.
$t
o
"
line conta
i
n
s
unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an
H
erland
bu
i
l
tin
-
notes: Mi
n
or (most
l
y parse_optio
n
s-re
l
ate
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an Herland
s
ub
m
od
u
l
e summary: Don
'
t
b
a
r
f when invoked
in
a
n
empt
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
builtin-notes: Add "copy" subcom
m
and f
o
r copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
bu
i
ltin-
n
ot
e
s: Misc
.
ref
a
c
t
o
r
i
ng o
f
argc and exi
t
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builti
n
-notes: A
d
d -c/-C options
f
or reu
s
ing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
bu
i
lti
n
-notes:
Refactor ha
n
dling of -F
o
ption to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Deprecate
t
he -m/-F o
p
tion
s
f
or "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
builtin-notes: Add "
a
ppend" subcomman
d
for ap
p
ending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes
:
A
d
d
"ad
d
" subcommand for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
notes:
A
dd --me
s
s
a
ge
/
--file a
l
iases for
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
Add "list
"
subcommand for list
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Docum
e
nta
t
ion: Generalize
git-note
s
docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
He
r
land
builtin-no
t
es: Add "p
r
une" subcomm
a
nd for re
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API:
prune
_
notes(): P
r
u
n
e
n
otes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
0
5
:
V
erify
that r
e
moving notes t
r
igge
r
s
automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-n
o
tes: Add "r
e
move"
s
u
b
command for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
T
e
ach builtin-
n
ot
e
s to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Teach
n
ote
s
code to pro
p
erly pres
e
rv
e
non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: V
e
rify that adding m
a
ny notes with g
i
t-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herlan
d
t3301: Verify
succes
s
ful annotation of
n
on-c
o
m
m
its
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han He
r
lan
d
B
uil
t
in-ify git-note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor notes concatena
t
ion
i
nto a
f
lexible in
t
er
f
ace
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
A
llow multipl
e
c
o
ncurrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API
:
write_not
e
s
_
tree()
:
Store the notes
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes API: for_each_note
(
)
: Tr
a
v
ers
e
the entire n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
N
o
t
es API: get_note(): Return
t
he note annotating
t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API: remove_note(): Rem
o
ve note o
b
ject
s
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI: add_note(
)
: Add n
o
te ob
j
ects t
o
the i
n
t
e
r
n
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes
A
PI:
init_notes(): Ini
t
i
al
i
ze
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
lan
d
Add tests for
checking correc
t
handling
o
f $GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
t
es API: get_commit
_
notes() -> format_
n
ote() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
M
i
nor cosmetic fi
x
e
s to n
o
tes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan
Her
l
a
nd
built
i
n-config: Fix cra
s
h
whe
n
using
"
-f
<
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herl
a
nd
Add
m
ore testcases
to test
f
ast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to t
9
350,
t
o
m
a
ke
r
oom
for
more fast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
e
rla
n
d
fast-im
p
o
r
t: Pr
o
per
not
e
s tre
e
manipulat
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
F
i
x cr
a
sher on
encountering SHA1-like no
n
-no
t
e in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next