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
git-svn: Warn about changing default for --prefix in Git v2.0
2013-10-12
Johan Herland
git
-
s
vn
:
War
n
about c
h
a
n
g
ing default for
-
-
prefix in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan
H
erland
Documentat
i
on/git-svn: Promote the u
s
e
of --prefix
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
ohan Herland
t3200
:
A
d
d
test demonstrating
m
inor regres
s
ion in 41c21f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Her
l
and
Refer to branch
.
<name>
.
remote/merge when documenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
a
n Herland
t3200: Mino
r
fix when preparing for tr
a
cking fa
i
lure
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
a
n Herla
n
d
t2
0
24: Fix &&-chai
n
in
g
an
d
a couple of
typ
o
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move
cr
e
ate_notes_comm
i
t() from not
e
s-merge
.
c
i
nto
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move
c
op
y
_no
t
e
_
for_r
e
write + frien
d
s fr
o
m bui
l
t
i
n/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
fi
n
ish_co
p
y_notes_for_re
w
rite(): Let caller provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glossary: Update and rephrase the definitio
n
of
a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c
: Validate tracking branc
h
es with ref
s
pecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Her
l
and
t9114
.
2:
D
on't use --track
o
ption against "svn
-
r
emote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an H
e
rland
t7201
.
24
:
A
d
d
r
e
f
spec to keep -
-
trac
k
work
i
n
g
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herl
a
nd
t3200
.
39:
t
racking setu
p
should fa
i
l
i
f th
e
re is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
a
nd
checkout:
U
se re
m
ote refspecs
w
h
en DWI
M
ming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Her
l
and
t20
2
4
: Show
failure to us
e
refspec w
h
en DWI
M
min
g
remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herl
a
nd
t20
2
4: Add tests ver
i
f
ying cu
r
rent D
W
IM behav
i
or of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
o
h
a
n
Herland
git
symbolic-ref --d
e
let
e
$
s
ymref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix
failu
r
e to delete a pa
c
ked ref t
h
rough a
symre
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
t1400-update-r
e
f: Add
test verify
i
ng
b
ug with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
l
a
n
d
note
s
-
m
erge:
Don't re
m
ove
.
g
it/NOTES_MERGE_W
O
RK
T
REE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
no
t
es-
m
e
r
ge: use opendir/
r
eaddir instead of
u
sing
r
ead_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
o
h
a
n Herla
n
d
t3310: illustra
t
e
failure
t
o
"notes mer
g
e
--
c
ommit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fa
s
t-import: F
i
x in
c
orr
e
ct fan
o
ut l
e
vel w
h
en m
o
difyi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
He
r
land
t9301:
A
dd 2nd testca
s
e e
x
posing
b
ugs in fast-
i
m
port
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
t9301
:
F
ix tes
t
case coveri
n
g up a bug in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400:
Fix a c
o
uple
o
f
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Mark di
r
s
tat error messages f
o
r tr
a
n
s
lation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve
er
r
or handlin
g
when parsing dirstat param
e
ters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
N
ew --dirstat=lines mode,
doin
g
dirstat analysis bas
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herl
a
nd
All
o
w specifying --dirst
a
t
c
ut-
o
ff p
e
rcentage
a
s a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
d
d conf
i
g variable
for specifyin
g
default --di
r
stat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Refactor
--dirsta
t
parsing; deprecate --cu
m
u
lative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herl
a
nd
M
a
k
e
-
-
dirst
a
t=0 output director
i
es th
a
t co
n
trib
u
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
A
d
d
s
everal
t
estcases
for --dirstat and f
r
iends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Herland
-
-
d
irsta
t
: In
case of renam
e
s, u
s
e target filena
m
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Tea
c
h --dirstat not to com
p
letely i
g
nor
e
rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
--dirstat-by-file: Make it faster
and
m
ore correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rland
-
-dirs
t
a
t:
D
escribe non-
o
b
v
ious diffe
r
ences relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git notes add" more user
-
friendly
w
hen
t
h
ere
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty-optio
n
s: Document --[no-]notes
a
n
d deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han
H
erland
branc
h
/checkout --track: En
s
u
r
e that
upstream bran
c
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
d
e
fault: Rename 't
r
acking' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
r
o
vide 'git merge --ab
o
rt' as a sy
n
onym t
o
'
g
it
reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_me
r
ge(): Parse
opti
o
ns
b
ef
o
re checkin
g
MERG
E
_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git not
e
s
get-ref'
to easily re
t
rieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge:
A
dd testcases for merg
i
ng notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
git notes merge: Add another auto-resolving st
r
ateg
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
g
i
t
n
o
tes me
r
g
e: --comm
i
t should fail if unde
r
lying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge: Li
s
t confli
c
ti
n
g note
s
in no
t
es merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it
n
otes
m
erge:
M
a
nual conflict resol
u
tion, par
t
2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t notes merg
e
: Manual conflic
t
resolution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docu
m
entation: Prelim
i
nary
d
ocs on 'git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git no
t
es merge:
A
dd automatic conflict
resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git
n
o
t
e
s m
e
rge
:
Handle real, non-conf
l
ict
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
builtin/no
t
es
.
c
:
Refactor creation of n
o
tes c
o
mmits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git notes merge:
I
nit
i
a
l
implemen
t
atio
n
handling tri
v
ia
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
b
uiltin/notes
.
c: Split
notes ref DW
I
Mme
r
y into a
s
e
parate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
n
otes
.
c: Use two newlin
e
s (instead of one) when
concatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
(trivial) t
3
3
03: Indent wit
h
ta
b
s instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Propagate
c
o
m
b
i
ne_n
o
t
e
s_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
He
r
land
n
o
tes
.
h/c:
Allow combi
n
e_notes functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
oha
n
Herland
n
otes
.
c
:
R
eorder functions in
p
reparatio
n
for
nex
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n
Herland
notes
.
h
: Make default_n
o
tes_
r
ef() available in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
(trivial) notes
.
h: Min
o
r
d
o
c
u
mentation
fixes to copy_n
o
tes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
He
r
l
and
notes
.
c: H
e
xify SHA1 in d
i
e() m
e
ss
a
ge from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan
Herl
a
nd
notes
:
Do
n
't create (empty)
c
ommit whe
n
removing
n
o
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Ena
b
le custom schemes for
colu
m
n colors in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
nd
M
a
ke grap
h
_next_line() available in the g
r
aph
.
h AP
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
revision: Turn off h
i
story simplif
i
cation in --ancestr
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herlan
d
revisi
o
n: Fix typ
o
in --
a
n
c
e
stry-p
a
th error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herland
Doc
u
menta
t
ion/rev-list
-
options
.
t
xt: Explain -
-
a
n
ces
t
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev-lis
t
-options
.
txt: Fix missin
g
l
ine
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c:
E
nsure
"
index
$from
.
.
$t
o
"
l
in
e
contains unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-notes: Minor (mostl
y
parse
_
options
-
relate
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Her
l
and
submodule sum
m
ary: Don
'
t b
a
rf when
i
nvo
k
ed in an
empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "copy
"
subcomm
a
nd for co
p
ying
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
M
isc
.
refactoring of
a
rgc
a
n
d exit va
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add -c/-C opt
i
ons for
reusing no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
b
u
iltin-notes
:
Refacto
r
handling of -F
option
t
o allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: Deprecat
e
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 Her
l
and
builtin-notes: Add "app
e
nd"
s
u
bcommand
f
o
r
a
ppen
d
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
:
A
dd "add"
s
ubcommand for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
buil
t
i
n
-n
o
tes: Add -
-
message/--fi
l
e aliases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
bu
i
lt
i
n-notes:
A
dd "li
s
t
" s
u
bcomm
a
nd for lis
t
ing n
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
D
ocumentation: Generali
z
e git-n
o
tes d
o
cs to '
o
bjects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Add "pr
u
ne" subcommand fo
r
removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API:
p
ru
n
e_notes(
)
: Prune note
s
that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
30
5
: Veri
f
y
that r
e
moving
n
otes triggers
a
utomatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-
n
ote
s
: Add "
r
emove
"
subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
Teach bui
l
tin-no
t
es to remove empty note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach no
t
es code to properly pr
e
s
er
v
e
n
o
n-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t3305: Verify
that adding
many notes
w
ith git-
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3301: Verify successful
annota
t
ion
of
n
on
-
commit
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
B
uiltin-ify gi
t
-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herlan
d
Refactor notes
c
oncatenati
o
n into a flexi
b
l
e interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes API: Allow multiple concurrent n
o
tes trees
w
ith
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API:
wr
i
te_notes_t
r
ee()
:
St
o
re
t
he notes
tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
Notes API
:
for_each_n
o
te(): Tra
v
erse the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API
:
get_note(): Return t
h
e n
o
te annot
a
t
i
n
g
t
h
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next