repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/ls-files-killed-optim' into maint
2013-09-09
Johan Herland
t3200: Add test d
e
m
o
n
s
t
rating minor regression in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
n
d
Refer to b
r
a
nch
.
<name>
.
remote/merge when documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
Herland
t3200: Minor
f
ix
w
hen prepa
r
ing f
o
r tracki
n
g failur
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herla
n
d
t2024: Fi
x
&&
-
chaining and a
couple of typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Mo
v
e
create
_
no
t
es_commit() from notes-merge
.
c int
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n Herland
Move copy_note_for_rewrite + friends from bui
l
tin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_copy_notes_for_rewrite
(
): Let caller p
r
ovid
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glossary: Update and
re
p
hrase
t
he de
f
inition o
f
a re
m
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Validate tracking branche
s
wit
h
ref
s
pecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
t9114
.
2: Don't
u
se --track o
p
tion against
"
s
v
n
-
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t7201
.
24: Add
refspec t
o
kee
p
--track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3200
.
39: trackin
g
setup sho
u
ld fail
if t
h
ere is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan He
r
l
a
nd
checkout: U
s
e remote
r
efspecs when DWIMming trackin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
H
erland
t2024: Show failur
e
to use r
e
fsp
e
c whe
n
DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han
H
e
r
land
t2024: Add tes
t
s verifying current
D
WI
M
b
ehavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symbo
l
ic-
r
ef
--delete $
s
ymre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
n
d
Fix fail
u
re t
o
de
l
ete a packed ref thro
u
gh a sy
m
ref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herland
t
1
400-update-ref: Add test verifying b
u
g with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an Her
l
and
notes-me
r
ge
:
D
on'
t
remov
e
.
git/NOTES
_
ME
R
GE_WORKTR
E
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan H
e
rland
notes
-
m
e
rge: use op
e
n
dir/read
d
ir inste
a
d
of usin
g
r
ead_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
a
n
Herland
t33
1
0: il
l
ustrate failure to "notes merge --comm
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
f
a
st-imp
o
rt: Fix incorrect fa
n
out level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2nd tes
t
c
ase
exposing b
u
gs in fast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
t9301: Fix
testcase covering
up a bug
i
n
fas
t
-
im
p
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5
4
00: Fix a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Mark dirstat error messages for tra
n
slatio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herl
a
nd
Improve e
r
ror
h
andl
i
ng when par
s
ing dirstat
parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n
He
r
land
New -
-
dirstat=lines m
o
de, doing dirstat an
a
lysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Allow specifying
-
-
dirstat cut-off percentag
e
a
s
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config variable for specifyin
g
d
e
faul
t
--d
i
rstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Refactor --dirsta
t
par
s
ing; deprecate -
-
cumulativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Make --dirstat=0
output directo
r
ies th
a
t contribu
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add severa
l
testcases for --
d
irs
t
at and f
r
ien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Herland
--dirstat: In
c
ase
of
r
e
names
,
u
s
e targe
t
filenam
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
Teach --dirs
t
at not to c
o
m
ple
t
ely
i
gnor
e
rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--
d
irstat-by-f
i
le
:
Make it faster and more cor
r
ect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
H
erland
--dirstat: Des
c
ribe non
-
obviou
s
di
f
feren
c
es relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "
g
i
t
notes add" more user-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herland
l
og/p
r
e
tty-opt
i
ons: Docume
n
t --[no-]no
t
e
s
and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/
c
heckout --
t
rack: Ensur
e
th
a
t upstream bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herland
push
.
default: Ren
a
me 'tracking
'
to 'u
p
stream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Provide
'git merge --abort' as a syno
n
y
m to
'
git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
H
e
rland
cmd_
m
erge(
)
: Parse opt
i
ons before ch
e
cking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
land
Provide 'git note
s
g
et-
r
ef'
to easily retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes
m
erge: Add testcases for mergin
g
notes
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge: Add
a
nother auto-reso
l
ving str
a
teg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
gi
t
notes
m
erge: --commit should f
a
il if under
l
ying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
nd
g
i
t no
t
es merge: List
conflicting notes in note
s
m
e
r
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merge:
M
anual conf
l
ict resolut
i
on, part 2/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes me
r
g
e
: Manual conflict resolution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Documentatio
n
: Preliminary do
c
s on '
g
it not
e
s mer
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
note
s
merge
:
Add
autom
a
tic confli
c
t resolv
e
rs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git n
o
tes m
e
rge: Handle real, no
n
-con
f
lict
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rlan
d
b
uiltin/notes
.
c:
R
e
f
actor creati
o
n
o
f no
t
es comm
i
ts
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge
:
I
niti
a
l
implementat
i
on handling
trivia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
builtin/no
t
es
.
c: Spl
i
t not
e
s ref DWI
M
mery into a s
e
par
a
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
notes
.
c: Us
e
t
w
o newlines (instea
d
of o
n
e)
w
hen conc
a
t
e
natin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
(tri
v
ial)
t3303: Indent
with ta
b
s in
s
te
a
d of space
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
no
t
es
.
h/c
:
Propagate combin
e
_notes_fn return valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
h/c
:
Al
l
ow combine_no
t
es f
u
nct
i
ons to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herla
n
d
n
o
tes
.
c: R
e
order f
u
nc
t
ions in prepara
t
ion for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herla
n
d
notes
.
h: Make
default_n
o
tes_ref()
avai
l
able in
notes
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan He
r
land
(trivial
)
notes
.
h
: Mi
n
or docu
m
e
ntatio
n
f
ixes to
copy
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
notes
.
c:
H
exify SHA1 in die(
)
me
s
sage
f
rom init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
Herland
notes:
D
on
'
t crea
t
e
(
empty) commit when rem
o
ving non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable c
u
stom sche
m
es f
o
r column colors in the
graph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Mak
e
graph_next_line() availab
l
e in the grap
h
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herlan
d
revision:
T
urn o
f
f history simplifi
c
atio
n
in --a
n
cestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
on:
F
ix typo in --ancest
r
y-path error
m
essa
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
ha
n
Herland
D
o
c
umentation
/
r
ev-l
i
st
-
o
p
tio
n
s
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
Docume
n
tation/rev-list-op
t
ions
.
txt: Fix mis
s
ing
l
ine
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan
Herland
diff
.
c: Ensure
"
index $from
.
.
$to" line contains u
n
ambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han Herl
a
nd
builtin-no
t
es:
M
ino
r
(mostly
parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
ohan Herland
s
ubmodule summary: Don't barf w
h
e
n
i
nvoked in an
e
mpty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
bu
i
ltin-
n
ot
e
s: Ad
d
"
c
opy" s
u
bcommand
f
o
r c
o
pying
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-notes:
Misc
.
r
efactoring
o
f argc
and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: Add -c/-
C
optio
n
s for reusin
g
note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
bu
i
ltin-n
o
tes:
R
efactor handlin
g
o
f -F
option to al
l
ow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builti
n
-
n
ot
e
s: Dep
r
ec
a
t
e the -m/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
t
e
s:
A
dd "append
"
s
u
bc
o
mm
a
nd for ap
p
endin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
builtin-notes:
A
dd "add"
s
u
b
com
m
and for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
buil
t
i
n
-notes
:
Add --mes
s
a
ge/-
-
fi
l
e aliases
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "list" subcomm
a
nd for listi
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Docu
m
entation: Genera
l
ize gi
t
-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
b
u
iltin-notes: Add "prune" su
b
c
ommand for remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herla
n
d
Notes
A
PI:
prune
_
notes(): Prune n
o
tes that
b
elong
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
nd
t3305: Verify
t
hat r
e
moving not
e
s
triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builti
n
-notes: Add "remove
"
subcomm
a
n
d for rem
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
Teach builtin
-
notes to remove empty
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Tea
c
h no
t
es code to properly preserve
non
-
not
e
s in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
a
n
d
t
33
0
5: Verify that adding many notes w
i
th
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t3301: Verify successf
u
l annotation
of
n
on-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herlan
d
B
u
i
ltin-if
y
g
it
-
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
R
e
facto
r
notes concatenat
i
on in
t
o a flexible inte
r
f
a
ce
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Note
s
API: A
l
l
o
w multiple
con
c
urrent
n
otes tree
s
w
ith
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes API: writ
e
_
n
o
tes_tr
e
e()
:
S
tore
t
h
e
notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
N
o
t
es API: fo
r
_each_note(): Trav
e
rse the enti
r
e no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
AP
I
: get_note(): Retur
n
t
he not
e
annota
t
ing the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
N
o
tes AP
I
: r
e
mo
v
e_note(): Remove not
e
objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
API: add_note
(
): Add note ob
j
e
c
t
s to
t
he
i
n
t
er
n
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next