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
glossary: Update and rephrase the definition of a remote-tracking branch
2013-04-21
J
o
han
Herland
gl
o
ssary: Update
and rephrase the definition of a rem
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c
:
Valida
t
e t
r
acking bra
n
che
s
w
ith refspec
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan He
r
l
and
t
9114
.
2: Don't use --track
o
ption aga
i
nst "svn-re
m
ote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t7201
.
24: Ad
d
refspec to keep --
t
rack working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t3200
.
39: tracki
n
g setup should fail if there is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
H
e
r
l
and
check
o
ut: Use
remo
t
e refspecs when
DWIM
m
ing tra
c
king
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herl
a
nd
t202
4
:
S
how
f
ailure to use refspec
when DWIMmin
g
remo
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t
2
02
4
: Add tests verifyi
n
g current DWIM
b
ehavi
o
r of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symbolic-ref
-
-
d
elete $s
y
m
ref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herlan
d
Fix failure
to delete
a
packed
r
e
f through a sym
r
e
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rlan
d
t
1
400-update-
r
e
f: Add
test verifying bug
with symre
f
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
o
ha
n
Herlan
d
no
t
es-merge: Don't re
m
ove
.
gi
t
/NOTES_M
E
RGE_W
O
RKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herland
notes-
m
erge: use opend
i
r/readdir instead
of using
r
e
ad
_
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
t
3
310: ill
u
s
t
rate f
a
i
l
u
r
e to "notes merge
-
-
c
ommit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
er
l
and
fa
s
t-import:
Fi
x
inco
r
rect fan
o
ut le
v
el when m
o
di
f
ying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2nd testcase exposing bugs in fast-im
p
ort
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herland
t
9
301:
F
ix te
s
tcase coveri
n
g
u
p a bug
i
n f
a
st-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan He
r
land
t5400:
F
ix a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n
H
erl
a
nd
Mark di
r
sta
t
error messages for
t
ran
s
lation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
e
r
lan
d
Improve erro
r
h
andling whe
n
parsing dirsta
t
p
aramet
e
r
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New -
-
dirsta
t
=lin
e
s mode, do
i
ng d
i
rs
t
at analysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow sp
e
cifying --dirstat cut-off percentag
e
as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Add con
f
ig variable for specifyi
n
g de
f
ault --d
i
rstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herla
n
d
Re
f
a
c
tor --dirstat p
a
r
s
ing;
deprec
a
t
e
--cu
m
ulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Make --dirsta
t
=
0
output
d
irectorie
s
th
a
t
c
o
n
tribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rl
a
n
d
Add sever
a
l
test
c
as
e
s for
--dirstat and friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--d
i
rstat: In
c
a
se of renames
,
use target filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
T
e
ach --dirstat n
o
t to completely
i
gnore
r
earran
g
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dir
s
tat-b
y
-file: Make it faster and more correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
oha
n
Herlan
d
--di
r
stat:
Des
c
ribe n
o
n-
o
bv
i
ous differences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
M
a
ke "git
not
e
s add"
m
ore user-f
r
iendly when t
h
e
re
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n
Herlan
d
log/pretty-o
p
tions:
D
ocument --[no-]notes and d
e
prec
a
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
b
r
anch/checko
u
t --track: Ensure that upstr
e
am
b
r
a
nch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default: Rename 'track
i
ng' to 'upst
r
eam'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
H
e
rla
n
d
Provi
d
e 'git mer
g
e
--abor
t
' a
s
a synonym
t
o 'g
i
t reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
cmd_merge(): Pa
r
se o
p
t
i
ons before checking M
E
RGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
er
l
and
Provide 'git
n
otes
g
et-ref'
t
o e
a
sily
r
etr
i
eve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merge: Add test
c
ases
for merging n
o
t
e
s trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merge: Add another auto-resolving s
t
rateg
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git no
t
es merge: -
-
commit
s
hould fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
not
e
s
m
e
r
ge: List conflictin
g
notes in no
t
es merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
git
n
otes me
r
g
e: Manual conflict res
o
lutio
n
,
p
art
2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
e
s
me
r
ge:
M
anu
a
l c
o
nflict resolution,
part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Documentatio
n
: Preliminary
d
o
cs on
'
g
it n
o
tes
m
erge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
He
r
land
g
i
t
notes
merg
e
:
Add automatic conflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes
m
erge: Hand
l
e real, non-conflicting
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
builti
n
/
n
o
tes
.
c: Refactor creation of notes
c
o
mmits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git note
s
merge: Initial
i
mple
m
en
t
a
t
ion handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
builtin/notes
.
c:
S
plit notes ref DWIM
m
e
ry in
t
o
a
se
p
ar
a
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
notes
.
c: Use two newlines
(inst
e
ad of one) whe
n
concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(
t
r
i
v
i
a
l
) t3303: Ind
e
nt with tabs
i
nstead of spa
c
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h
/c: Propagate combine
_
no
t
es_f
n
return val
u
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow comb
i
ne_notes func
t
ions
t
o remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
n
otes
.
c: Reorder f
u
n
c
ti
o
ns in prepa
r
a
tion for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
note
s
.
h: Make default
_
n
otes_re
f
(
) available in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
(trivial) notes
.
h: Minor docume
n
tatio
n
fixes to copy_notes(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hexi
f
y S
H
A1
i
n
die
(
)
m
essage from init_not
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
Herland
notes: Don't
crea
t
e (empty) commit when removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Ena
b
le custom
schem
e
s for col
u
mn colors in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
M
a
ke
graph_next_line() a
v
a
ilable in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
revision
:
Turn o
f
f history simplificatio
n
in
-
-ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
re
v
ision:
F
ix
t
ypo
i
n --
a
ncestry
-
path error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
D
o
cumenta
t
ion
/
rev-list-options
.
t
x
t: Explain --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
umentation/rev-list-options
.
txt:
F
i
x
m
i
ssing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure "index $from
.
.
$to" li
n
e contains un
a
mbiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
b
u
iltin-notes: Minor (mo
s
t
l
y parse_opti
o
n
s-rel
a
ted
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an H
e
rland
subm
o
dule su
m
m
a
ry: Don't
b
arf when invoked
in an
e
mpty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
bui
l
tin-note
s
: Add "copy" subcommand for copyin
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
r
land
builtin-not
e
s:
M
isc
.
r
efac
t
orin
g
of argc a
n
d ex
i
t valu
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bu
i
l
tin-notes:
Add -c
/
-C options for
r
e
using note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-
n
otes: Refac
t
or handli
n
g of -F opt
i
on to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
buil
t
in-no
t
es: Deprec
a
te the -m/-F o
p
tions
f
o
r
"git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin
-
notes: Add "
a
ppend" subcommand for
a
p
pending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
built
i
n-notes: A
d
d "add" subcomman
d
for ad
d
ing notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
bu
i
ltin-no
t
es
:
Add --message
/
--file al
i
a
se
s
for
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
bui
l
tin-
n
otes: Add "list" s
u
bcom
m
and for
listing not
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Docum
e
ntation: Ge
n
eralize git-notes d
o
cs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
built
i
n-notes: Add "pr
u
n
e
"
s
ub
c
ommand f
o
r remov
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes A
P
I: prun
e
_notes(
)
:
Pr
u
ne note
s
that
belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: V
e
rify that rem
o
v
i
ng notes tr
i
g
gers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-not
e
s
:
A
dd "remove" subcomm
a
n
d for remov
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
Teac
h
builtin-note
s
t
o remove empty
n
otes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Teach notes code to prop
e
rly preserve n
o
n-
n
otes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verif
y
th
a
t
adding many notes with git-no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
t3301: Ve
r
ify successf
u
l annotation o
f
non
-
comm
i
ts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Builtin-ify gi
t
-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refa
c
tor notes
co
n
catenation into
a flexib
l
e interf
a
ce
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API
:
Allow m
u
ltipl
e
c
oncurr
e
nt no
t
es t
r
ees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
No
t
es API: write_not
e
s_tree()
:
Store th
e
notes tr
e
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: for_each_n
o
t
e():
T
raverse the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rland
N
o
tes A
P
I: get
_
n
ote(): Retu
r
n the note ann
o
tating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API:
r
emo
v
e_note(): Re
m
ove not
e
ob
j
ects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
Notes API: add_note(): Add note o
b
jects to the intern
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Not
e
s A
P
I: init
_
notes(): Initialize the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Add tests for c
h
ecking correct handling o
f
$GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Note
s
API: get_
c
ommit_
n
otes() -> form
a
t_note() + remov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
Mino
r
co
s
metic fixe
s
to not
e
s
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-confi
g
: Fix crash wh
e
n u
s
ing "
-
f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan
H
erland
Add
m
o
re testcases to test fast-import of
n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joh
a
n Herla
n
d
Rena
m
e t9301 to t9350
,
t
o ma
k
e
r
oom for
m
o
re fast-impor
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next