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
t5570: Update for clone-progress-to-stderr branch
2013-09-09
J
o
h
a
n H
e
r
l
and
t
3
2
0
0: Add t
e
st demonstrating min
o
r
r
egression i
n
41c21f
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Herland
Refer to branch
.
<name>
.
remote/me
r
ge when d
o
cume
n
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t3200
:
Minor fix
when pre
p
aring for tracking failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t2024: Fix &&-
c
h
a
i
n
i
ng and a
c
ouple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herlan
d
Move create_notes_com
m
it()
f
r
om
notes-merg
e
.
c int
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
ohan
H
e
rland
Move
copy_note_for_rewrite + frie
n
d
s
from builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
land
finish_copy_note
s
_for_rewrite
(
):
Let caller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
glossary: Update
a
n
d rephras
e
t
h
e definition of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
b
r
anch
.
c: Vali
d
ate tracking
b
ranche
s
wi
t
h ref
s
pecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herlan
d
t9114
.
2: Don't us
e
--track opt
i
o
n a
g
a
inst "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t7201
.
24: Add
re
f
spec to keep --track wor
k
ing
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3200
.
39:
tracking setup should fail if there is
no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Use
remot
e
refs
p
ecs when
DWIMming
tra
c
k
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Her
l
and
t2024: Show failure to use
refspec when DW
I
Mming
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
Herland
t2024
:
Add tests verif
y
ing c
u
rrent DWIM be
h
avior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symbolic-ref
-
-
de
l
ete $symr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
Herland
Fix failu
r
e to
d
e
l
e
te a
packed r
e
f through a symr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
Herland
t1400-
u
pd
a
te-ref: A
d
d t
e
st
v
erifying
bu
g
w
ith symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an Herland
notes-
m
erge: Don't rem
o
ve
.
g
i
t/NOTES_M
E
R
G
E_WO
R
K
T
REE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
erland
notes-merge: use ope
n
dir/readdir instead
o
f
usi
n
g read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n Herland
t3
3
10: il
l
u
strate fai
l
ure t
o
"
notes me
r
ge --
c
o
m
m
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an
H
erlan
d
fast-im
p
o
r
t
: Fix incorrect fanout level w
h
e
n
modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an
H
erland
t9301: Add 2nd
t
e
stcase exp
o
sin
g
b
u
gs
in
f
ast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t9301:
Fix testcase coveri
n
g u
p
a
b
ug in fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
J
o
han Herla
n
d
t5
4
00:
Fix a couple of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
r
land
Mark di
r
sta
t
er
r
or messages fo
r
translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n H
e
r
l
and
Imp
r
ove error h
a
nd
l
i
n
g
whe
n
p
a
rsing d
i
rsta
t
parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
New --dirstat=
l
ines mode,
d
o
i
n
g dirs
t
at analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herla
n
d
Al
l
ow specifying --dirstat cut-off percentage
a
s a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
A
d
d config v
a
ria
b
le for spec
i
fyi
n
g
defau
l
t
-
-dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
la
n
d
Refact
o
r --dirs
t
at parsing; deprecate
-
-cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rlan
d
Make --
d
ir
s
tat=0
o
utput
d
irectories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Add se
v
eral
testcases for --d
i
rstat an
d
frien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
land
--dirsta
t
:
In c
a
se of renames, use
target
f
i
l
enam
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
Teach --
d
irs
t
at n
o
t to completely
i
gno
r
e re
a
rrange
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by
-
file: Make it faster and more cor
r
ect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--d
i
r
s
tat:
De
s
cribe non-obvi
o
u
s
differenc
e
s rela
t
ive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make
"
git
n
otes add" more
use
r
-f
r
iendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an Herland
lo
g
/pretty-option
s
: Docu
m
e
n
t --[no-
]
no
t
es
a
nd
d
eprec
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
Herland
br
a
nch/c
h
eckout --track: Ensure that up
s
tream
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herland
push
.
d
efau
l
t:
R
ename
'
track
i
ng'
t
o '
u
pstream
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Provi
d
e
'git merge --abort'
a
s a sy
n
onym
t
o
'git re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
H
erlan
d
cmd_m
e
rge(
)
: Parse
o
ptions before checki
n
g
MER
G
E_HE
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git n
o
tes g
e
t-re
f
' to easily
r
e
t
rieve c
u
rrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
gi
t
notes
m
erge:
Add testcases for mergin
g
not
e
s trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git not
e
s merge: Add a
n
other au
t
o-resolving strate
g
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes merge:
--c
o
mmit shou
l
d
fail if unde
r
lyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Lis
t
conflic
t
ing
notes in notes m
e
rge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
gi
t
n
o
t
es merge: Manu
a
l conflict resolu
t
ion, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
nd
git n
o
t
es merg
e
:
M
anual co
n
fl
i
ct
r
esolution, par
t
1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
rl
a
nd
Do
c
u
m
entat
i
on:
P
reliminary
d
ocs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
l
and
git notes merge: Add automatic confli
c
t
r
esolve
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git
n
otes
m
e
rge: Handle real,
non-conflicting
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erland
b
u
i
ltin/notes
.
c: Refactor
c
reatio
n
of
note
s
commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git note
s
merge: Initial implement
a
t
i
on ha
n
dling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builti
n
/notes
.
c: Split no
t
es ref DWIM
m
ery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use two newlines (instead of on
e
) whe
n
co
n
catenati
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivi
a
l) t3303: Indent
w
ith
t
abs
instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
note
s
.
h/
c
: Propagate combi
n
e_notes_fn ret
u
r
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h
/
c:
A
llow combi
n
e_notes function
s
t
o
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
notes
.
c: Reorder
f
unctions in prepara
t
i
o
n f
o
r next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n
He
r
land
notes
.
h:
M
ake
default
_
notes_re
f
(
)
available in notes
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
oh
a
n
H
e
rland
(
trivial)
n
otes
.
h
: M
i
nor documenta
t
ion fixes to
c
opy_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
notes
.
c: Hexify SHA1 in die() mes
s
a
g
e from
i
ni
t
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
Herl
a
nd
notes:
D
on't
create (
e
mp
t
y) commit
w
hen removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
e
r
land
Enable custom s
c
hemes for column colors
i
n the g
r
aph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make
g
raph
_
next_line() ava
i
la
b
le in
the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
revision: Turn off
h
istory simplification in
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
r
evision: Fix typ
o
in --ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentatio
n
/rev-lis
t
-o
p
tions
.
tx
t
: Expl
a
in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
D
ocumentat
i
on/rev-lis
t
-options
.
txt: Fix
m
i
ssing lin
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Her
l
and
diff
.
c: Ensure "index $from
.
.
$to" line c
o
nt
a
ins un
a
mbiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
H
erland
builtin-notes: M
i
nor (
m
ostly p
a
rse_options-relate
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Her
l
and
s
ubmodule summary: Don't
barf when invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
H
erland
buil
t
in-notes: Add "copy" subcomman
d
for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Misc
.
refactoring
o
f argc and
e
xit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
builtin-n
o
tes: Ad
d
-c/-C optio
n
s
f
or reusing
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
b
u
i
ltin-n
o
tes: Refacto
r
handl
i
n
g
of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
bui
l
tin-
n
otes: Deprecate
t
he -m/-F optio
n
s for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-no
t
es
:
Add "append"
sub
c
ommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
Herland
built
i
n-no
t
es: Add
"add" s
u
bcom
m
a
nd for addi
n
g note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-n
o
tes: Add --
m
essage/--file
a
liase
s
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d "list" s
u
bcommand for listin
g
note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
D
o
cumentation: Genera
l
ize git-notes do
c
s to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-n
o
tes: A
d
d
"
p
r
u
ne" subcomman
d
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herla
n
d
Notes API:
p
rune
_
notes
(
): Prune notes t
h
at bel
o
ng
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify that remov
i
n
g notes t
r
iggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
bu
i
ltin-n
o
tes: Add "remove" su
b
command for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Teach builtin-notes to re
m
o
ve empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Teach notes
c
ode to
p
roperly preserve no
n
-no
t
es in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
305: Verify that
a
ddi
n
g many notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
t3301: Verify
successful annotation o
f
non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Builtin-ify
git
-
note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Refact
o
r
notes co
n
ca
t
enation into
a
flexib
l
e interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Not
e
s API:
A
llow multiple concurrent notes t
r
ees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Notes API: write_n
o
tes_tree
(
): Store
the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
Not
e
s
API: for_each_
n
ote(): Traverse the ent
i
re no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
No
t
es API: ge
t
_note(): Return the note
anno
t
a
ting
t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
N
o
t
e
s
A
PI:
remove_note(): R
e
move note objects f
r
om
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
a
nd
N
o
t
e
s AP
I
: ad
d
_note(): Add
n
o
te objects to
the i
n
te
r
nal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next