repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/gitmodules: Only 'update' and 'url' are required
2013-10-28
Johan Herl
a
nd
sha1_fil
e
.
c:create_
t
mpfile(): Fix race when cr
e
a
tin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Joh
a
n
Herland
git-svn: War
n
about changing
default
f
or --pr
e
fi
x
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Joh
a
n Herland
Documentation/git-svn: P
r
omote
t
he use of
-
-p
r
efix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan He
r
l
an
d
s
am
p
le pre-com
m
it hook: u
s
e
--bool when r
e
trieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t
3
20
0
: Add test
d
emonstrating minor
regress
i
on in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
e
rla
n
d
Refer
to branc
h
.
<n
a
m
e>
.
re
m
ote/mer
g
e
whe
n
documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200: Minor
f
ix when preparing for tracking
fail
u
re
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
r
l
a
nd
t20
2
4
:
F
i
x
&&-chain
i
ng and
a
couple
o
f
typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
ohan Herland
M
o
ve create_notes_commit
(
)
from notes-m
e
rg
e
.
c
i
nto
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n
H
erlan
d
Move copy_note_for_rewrite + f
r
iends fro
m
builtin/no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
land
fi
n
ish_co
p
y_notes_fo
r
_rewrite()
:
Let caller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
glossary: Update and r
e
phrase the
d
efinition
o
f a remo
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han He
r
land
b
ranch
.
c
:
Validate tracking b
r
anche
s
wit
h
refs
p
ecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
9
114
.
2
: Don't use --tr
a
ck o
p
ti
o
n against "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
t7
2
01
.
2
4
: Add
r
e
fs
p
ec to ke
e
p --t
r
ack working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t
3200
.
39: tracking setup sh
o
uld fail
i
f
there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Use remote refspecs when DWIMming
tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t2024: Show fa
i
lure to use ref
s
p
e
c when
D
W
IMming r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t2024: Add tests verifyi
n
g current DWIM behavior
o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
g
i
t s
y
mbolic-r
e
f
--del
e
te
$symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
F
i
x
fa
i
lure to delete a packed
r
ef through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
ha
n
He
r
land
t1
4
0
0
-updat
e
-r
e
f: Add test v
e
rifying bug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
n
otes-merge: Don't remove
.
g
it/NOTES_MERGE_WOR
K
TREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: us
e
opendir/readdir
i
nste
a
d of using read_
d
irec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han
H
erland
t33
1
0
: illustrate f
a
ilure to "notes merge --comm
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
f
a
st-i
m
p
o
rt
:
Fix incorrect
fanout
le
v
el when mo
d
ifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
t930
1
:
Add 2nd tes
t
case ex
p
osi
n
g bugs in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301
:
Fix testca
s
e 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
erland
t5400: Fix a
c
ouple
of typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
M
a
rk
d
irsta
t
error mess
a
ges for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n Herland
Improve
e
r
r
or h
a
ndling
w
hen
p
arsing dirst
a
t par
a
meters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
New --
d
irstat
=
lines mode, doing
d
irst
a
t analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herla
n
d
A
l
low sp
e
cifying --dirstat
c
ut-off
p
ercentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herla
n
d
Add config
v
a
r
iabl
e
for sp
e
cify
i
ng de
f
a
u
l
t
--dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
He
r
land
Refactor --dirstat parsing; deprecat
e
--cu
m
ulat
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Mak
e
--dirstat=0 ou
t
put directories th
a
t
contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rland
Add
s
everal testcases f
o
r
-
-
d
i
rstat an
d
frien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
an Her
l
a
nd
--dirstat:
I
n cas
e
of renames, us
e
target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Te
a
c
h --
d
i
rstat not to
c
o
mpl
e
tely ignore r
e
arranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan
Herl
a
nd
--d
i
rstat-by
-
f
i
l
e: Make it fast
e
r
an
d
more corre
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--dirstat
:
D
e
s
cribe non
-
obvious d
i
fferences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
M
a
k
e
"git notes ad
d
" more use
r
-friendly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herla
n
d
log/pretty-options: Documen
t
-
-
[no-]notes and
de
p
recate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan H
e
rl
a
nd
bra
n
ch/checkout --trac
k
: Ensur
e
th
a
t ups
t
ream
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Joha
n
Herland
push
.
default
:
Rename 'tracking' to '
u
pstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
r
ovide 'git merge --a
b
ort' a
s
a synon
y
m to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rland
cmd_merge(): Parse o
p
tions bef
o
re checki
n
g MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
Provide 'git notes get-ref' to easi
l
y retrieve c
u
r
r
ent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
notes
m
e
r
ge:
A
dd te
s
tc
a
ses
for merging notes
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
g
i
t
n
o
t
e
s
merg
e
: Add
anothe
r
auto-resolving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
rland
gi
t
not
e
s merge: --commi
t
s
hould fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
not
e
s merg
e
:
L
i
s
t conflicting n
o
t
e
s in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
e
r
g
e
: Manual co
n
fli
c
t r
e
solution
,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herl
a
nd
git notes me
r
ge:
M
anual confl
i
ct resol
u
t
ion, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Document
a
tion
:
Preliminary do
c
s
o
n 'git
n
o
tes
m
e
r
g
e'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes me
r
ge: Add
a
utomat
i
c conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merge: Handle re
a
l, non-conflict
i
ng
n
o
te
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Refactor creation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merge: Initial
i
mplementation handlin
g
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
builtin/notes
.
c: Split n
o
tes ref DWIMmery
i
nto
a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
no
t
es
.
c: Use two newlines (instead o
f
one)
when concaten
a
tin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(tri
v
ial) t3303:
I
n
dent wit
h
t
a
bs instead
o
f spac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
h/c: Propagate
c
ombine_notes_fn ret
u
rn v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rl
a
nd
not
e
s
.
h
/c: Allow c
o
mbin
e
_n
o
tes fu
n
ct
i
ons to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herl
a
nd
notes
.
c: Reorder functio
n
s
in prepar
a
tion for n
e
xt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erlan
d
notes
.
h: M
a
k
e
d
e
f
a
ult_note
s
_ref() availa
b
le in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erlan
d
(
t
rivi
a
l) n
o
tes
.
h:
Min
o
r docu
m
e
ntat
i
on
f
ixe
s
to copy_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
note
s
.
c
: Hex
i
fy S
H
A
1 in di
e
() message from init_note
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
n
otes:
D
on't cr
e
ate (
e
mpty) commit w
h
en removin
g
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
H
e
r
l
a
nd
Enable
custom schemes
f
or column
colors in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n Herl
a
nd
Make graph_
n
ext
_
line() available in the g
r
aph
.
h
A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herlan
d
re
v
ision: Turn
off history simplification in --ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n
Herland
r
evi
s
ion: Fix typo
i
n
--an
c
estry
-
path
e
rror mes
s
age
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
ha
n
Herland
D
oc
u
m
e
n
tation/rev-list-option
s
.
txt: Expl
a
in --ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
Docu
m
entation/rev-list-opt
i
o
ns
.
t
x
t:
F
ix
m
issing lin
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
rlan
d
diff
.
c: Ensure
"
index $from
.
.
$to" line c
o
ntains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Her
l
and
builtin-note
s
: Minor (mostly parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herl
a
nd
s
ubm
o
dule s
u
mma
r
y:
Don't b
a
rf when i
n
voked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Add
"
copy" subcommand fo
r
copyi
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: M
i
sc
.
re
f
acto
r
in
g
of arg
c
a
n
d
exit valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builti
n
-notes: Add
-
c/-C option
s
for reus
i
ng notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
builtin-no
t
es:
Refactor handling of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herlan
d
b
uil
t
in-notes:
D
eprecate the -m/-F options for
"
git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes:
Add "appen
d
" subcommand fo
r
appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
il
t
in-notes: Add
"
a
dd" subcommand f
o
r adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes: Add --messag
e
/--
f
ile aliases
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
u
iltin-notes: Add "list"
s
ubcommand for
l
i
sting no
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
Documentati
o
n: Gene
r
alize
g
it-no
t
e
s
docs
t
o '
o
bjec
t
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-
n
otes: Add "prune
"
subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
nd
Notes API: prune_notes(): Prun
e
n
o
t
es th
a
t
belong
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
Herland
t3305: Ve
r
if
y
that remov
i
ng not
e
s trig
g
e
r
s
a
u
t
omatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "remov
e
" sub
c
o
m
m
an
d
for remo
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Teach
builtin
-
n
otes to r
e
mov
e
emp
t
y
n
o
te
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
nd
Teach notes code to p
r
operly pre
s
erve
non
-
notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t
3305:
Verify that adding many
notes with gi
t
-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
01: Verify succes
s
ful a
n
notation o
f
n
o
n-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin
-
i
f
y
git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor
notes concaten
a
t
ion into a flexi
b
l
e
i
nterface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
Notes API: Al
l
o
w
mul
t
iple concurrent notes
trees w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: write_notes_tr
e
e
():
S
t
o
re
t
he no
t
es tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next