repo.or.cz
/
git
/
gitweb.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
J
oh
a
n Herl
a
nd
t3200
:
Add tes
t
demo
n
strating minor regress
i
on in
41c21f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Her
l
and
Refer to branch
.
<name
>
.
remo
t
e/merge
when documenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rland
t3200: M
i
nor f
i
x when prep
a
ring for tracking fail
u
re
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Her
l
and
t2024: F
i
x
&&-chaining and
a coupl
e
of ty
p
os
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herla
n
d
gl
o
ssary: Update and re
p
hrase th
e
defin
i
tio
n
of a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
bra
n
ch
.
c
:
V
a
lidate
t
rac
k
i
n
g branches with refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t9114
.
2
:
Don
'
t us
e
-
-
tra
c
k
o
ption a
g
ainst "svn-remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan H
e
rland
t7201
.
24: A
d
d refspec to keep --track worki
n
g
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3
2
00
.
39
:
track
i
ng setup should fail if
there is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
checko
u
t: Use
remote re
f
specs when
D
WIMming t
r
acking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
He
r
land
t
2024: Show fail
u
re
t
o us
e
r
efspec when DWIMmi
n
g remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rla
n
d
t202
4
:
Add
tests
verifying current DWIM be
h
av
i
or of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan H
e
rla
n
d
git symbolic-
r
e
f --dele
t
e $s
y
mref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
n
d
Fix
fai
l
ure to delete a pac
k
ed ref thr
o
ugh
a
s
ymref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Her
l
and
t1400-update-ref
:
Add test verifying
b
ug with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an
H
e
rland
notes-merge: D
o
n't remove
.
git
/
NOTES_MERGE_WOR
K
TREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
l
a
nd
notes-m
e
rge: use opendi
r
/readdir
i
nstead 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 Her
l
and
t
3310: il
l
ustrate failu
r
e
t
o "notes merge --co
m
mit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
o
ha
n
Herland
fas
t
-import: Fix
i
n
c
o
rre
c
t fanout level
when modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Ad
d
2nd
testcase expo
s
ing bugs in
fast-
i
m
p
ort
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
an
d
t
9301: Fix testcase cover
i
ng up a bug
in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
J
o
ha
n
Herla
n
d
t5400: Fix a cou
p
le
of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Mark dirst
a
t erro
r
message
s
f
o
r translat
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Improve error handling
w
hen parsing dirstat paramet
e
rs
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rland
New --dirstat=
l
ines mo
d
e, doin
g
d
i
rsta
t
analysis ba
s
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Al
l
o
w
specifying --dirstat cu
t
-off per
c
entage as
a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Ad
d
config
variab
l
e for speci
f
ying
d
efault --di
r
s
tat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Refactor --dir
s
t
a
t parsin
g
;
depre
c
ate --
c
umu
l
at
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Make --dir
s
tat
=
0 outpu
t
directories that contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several testc
a
ses for --
d
irs
t
at a
n
d
friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
land
-
-
dirst
a
t: In case of re
n
ames, u
s
e
t
ar
g
et f
i
lename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
He
r
land
Teach
--dirstat not to
co
m
plete
l
y ignore rearran
g
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirsta
t
-by-
f
i
le: Make it fas
t
er and more
c
orrect
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Her
l
and
-
-
dirstat: Desc
r
ibe non-o
b
vio
u
s d
i
f
ferences r
e
lative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan
He
r
la
n
d
Ma
k
e "git notes add
"
more user-friend
l
y when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
Herland
log/pretty-options: Document -
-
[n
o
-
]not
e
s and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan H
e
rland
branch/checko
u
t --track: E
n
sure that
u
ps
t
r
eam branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n
He
r
land
push
.
default: R
e
name '
t
rackin
g
' to
'ups
t
ream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
Provide 'git merge
--abort' as a syn
o
nym to
'g
i
t
r
ese
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
cmd_merge(
)
:
Parse option
s
be
f
ore chec
k
ing MERGE_H
E
AD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
Provide 'git not
e
s get-ref' to easily retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merg
e
: Add
te
s
tcases for merging n
o
t
e
s trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
n
ote
s
mer
g
e: Ad
d
another auto-resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
not
e
s
m
e
rge: --commit shoul
d
fail if underl
y
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes merge: List conf
l
i
c
t
ing notes
i
n
no
t
es me
r
ge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes mer
g
e
: M
a
nual conflict reso
l
ution, part
2
/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rland
git note
s
m
erge: M
a
nu
a
l conflic
t
res
o
l
ution
,
pa
r
t 1/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
Documentation: Preliminary
doc
s
o
n
'
git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes mer
g
e: Add
au
t
omatic conflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git n
o
t
e
s merge:
Han
d
le real, non-conflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
buil
t
in/notes
.
c:
R
efactor cr
e
a
tion of notes
commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
g
i
t n
o
te
s
m
e
rge: I
n
itia
l
i
mplem
e
nta
t
ion
h
andl
i
ng
t
rivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c
: Split
n
otes ref DWIM
m
ery in
t
o a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herlan
d
not
e
s
.
c: Use two new
l
ines (inste
a
d of one) when concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(t
r
ivial) t3303: I
n
dent
w
ith tabs instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/
c
: Propagate combine_n
o
tes
_
fn r
e
t
urn va
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
notes
.
h/c: All
o
w combine_notes functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c
: Reorde
r
functions
in pr
e
parat
i
on for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
note
s
.
h: M
a
ke default_n
o
t
e
s_
r
ef() availa
b
le in
notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
(
t
r
ivial) note
s
.
h: Min
o
r
d
ocumenta
t
ion fixes to copy_notes(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c:
He
x
ify SHA1 in die() message from
init_not
e
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
not
e
s: D
o
n'
t
create
(
empty) com
m
it when removing
no
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan He
r
land
Enable c
u
stom schemes f
o
r column
c
olors in the graph A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rland
Make
g
ra
p
h
_ne
x
t_line() a
v
a
i
lable i
n
the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
rland
revision:
Turn off history s
i
mplification in -
-
ance
s
try
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
o
n: Fix
ty
p
o in -
-
a
nc
e
stry-path erro
r
message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Document
a
t
ion/rev-list-
o
pt
i
ons
.
txt
:
Explain --ance
s
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
Docume
n
tation
/
rev
-
li
s
t-optio
n
s
.
txt: Fix missing l
i
ne
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure "in
d
ex $from
.
.
$to" li
n
e c
o
ntains una
m
big
u
o
u
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-notes: Mi
n
or (mostly
pa
r
se_
o
ption
s
-
related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an
H
erlan
d
submodule summary: Don
'
t bar
f
w
hen i
n
voked in a
n
e
mpty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
bui
l
tin-n
o
tes: Add "copy" s
u
bcommand for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
b
u
ilti
n
-n
o
tes: Misc
.
re
f
actoring
of
a
rgc an
d
ex
i
t value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
built
i
n-notes: Add -c/-C
o
pt
i
ons for reusin
g
not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-
n
ote
s
: Refactor hand
l
ing of -
F
opti
o
n to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
b
ui
l
tin-notes: De
p
recate the -m/-F op
t
ion
s
for "gi
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
bu
i
ltin-notes: Add "a
p
pend" su
b
comm
a
n
d for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: A
d
d "
a
d
d" s
u
bcommand for a
d
ding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add --message/--
f
i
l
e aliases for
-
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
bui
l
tin-notes: Add
"
list
"
subcommand for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n
Herland
Docum
e
nt
a
tion: Genera
l
ize git-note
s
docs to 'obje
c
ts
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
t
i
n-notes: Add "prune
"
subco
m
mand for removi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI: prune_notes():
Prune notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3305: Verify that
r
emoving
n
otes tri
g
gers automat
i
c
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Her
l
a
n
d
builtin-notes: Add "remove" s
u
bcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Teach builti
n
-notes to remove e
m
pty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Teach notes code to pro
p
erly preserve non-
n
ote
s
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305: Verify
that ad
d
ing m
a
ny notes with git
-
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301:
V
erify successful annotation o
f
non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
Builtin-ify git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
R
e
factor notes
c
onc
a
te
n
a
t
i
o
n into
a flexible i
n
t
erface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Notes API: Allow multiple concu
r
rent
no
t
e
s t
r
ees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
N
otes API: write_notes
_
tre
e
(): Store the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
No
t
es API: for_e
a
ch_note(): Traverse th
e
en
t
ire note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
N
o
tes API: get_n
o
te(): Retu
r
n the n
o
t
e
annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
o
tes
API: remove_note(): Remove not
e
objects
f
rom
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: add_
n
o
t
e(
)
: Add note obj
e
cts to the internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
Notes A
P
I: init_not
e
s
(): Initialize the
n
otes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Ad
d
test
s
for c
h
eckin
g
correct handling of
$
GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes API: get_commit_notes() -> fo
r
mat_no
t
e() + r
e
mo
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next