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
Joh
a
n Herl
a
nd
git-svn: War
n
about ch
a
nging
d
e
fa
u
lt for --prefix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
J
ohan Herlan
d
D
o
cume
n
t
ation/gi
t
-svn:
Promote
t
he use o
f
--prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
nd
t3200: Add test demonstr
a
t
i
ng minor regression in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Herland
Refer to branch
.
<nam
e
>
.
remote/merge w
h
en
docum
e
nting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an
Herland
t
3
200: Minor fix when preparing
for tracking failu
r
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erland
t
2
0
2
4: Fix
&
&-chaining a
n
d a cou
p
le of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
M
o
ve cre
a
te_n
o
tes_c
o
m
mit(
)
from note
s
-
m
erge
.
c
i
nt
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
a
n
H
erl
a
nd
Mo
v
e copy_note_for_rewri
t
e +
friends
f
rom bui
l
tin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_cop
y
_notes_for_rew
r
ite(): Let
caller
pro
v
ide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erl
a
nd
glossary: Up
d
ate and
r
ephrase the definition of a
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
branch
.
c:
Val
i
date tracking
bran
c
hes with
refsp
e
cs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t9114
.
2:
D
on't use
--track opti
o
n against "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
n
d
t7
2
01
.
24: A
d
d refspec to kee
p
--track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
3200
.
3
9
: tracking setup should fail if the
r
e is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
a
n H
e
r
l
a
n
d
c
h
eckout: Us
e
remote refspecs wh
e
n DWIMming tra
c
king
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Her
l
and
t2024: Show failure t
o
use
refspec when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t2024:
Add
t
ests verifying c
u
rrent DWIM b
e
havior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Her
l
a
n
d
git
symbolic-ref -
-
delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Her
l
and
Fix f
a
ilure to delete
a pa
c
ked ref
th
r
ough
a
symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
t1400-update-ref: Add test verif
y
ing bug with symre
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rla
n
d
notes-merge:
Don't
r
emove
.
git/NOTE
S
_MERGE_
W
ORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herl
a
nd
not
e
s-
m
erge
:
u
se op
e
nd
i
r/readdir instead
o
f 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 H
e
rland
t3310:
illust
r
ate failure
t
o
"note
s
merge -
-
commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
fast-im
p
ort: Fix incorre
c
t
fanout le
v
e
l when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herlan
d
t
9
301: Add 2nd testcase exposing
b
u
gs
i
n f
a
st-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
H
erland
t
9301
:
Fix testcase co
v
e
ring
u
p
a
b
ug
in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
He
r
land
t5400: F
i
x a coup
l
e
of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ma
r
k
dirs
t
a
t
err
o
r me
s
sage
s
for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Improve error handling when pa
r
sing d
i
rstat para
m
eters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
N
e
w
-
-dirstat=lines
m
ode, do
i
ng d
i
rstat anal
y
sis b
a
sed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Allow
s
p
ecifyi
n
g -
-
dirs
t
at cut-off perce
n
tage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config varia
b
le
f
o
r specifying de
f
au
l
t
-
-dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Refactor
--dirstat p
a
rsing; deprecate --cumul
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herl
a
n
d
Ma
k
e
-
-dir
s
tat=
0
out
p
u
t
d
ir
e
ctori
e
s that contrib
u
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erla
n
d
A
dd several
t
estca
s
es for
-
-dirstat a
n
d friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han Her
l
and
--di
r
st
a
t: In cas
e
of re
n
ames, use t
a
rget filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
H
e
r
l
and
T
each --dirstat not to completely ignore rearran
g
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-file: Mak
e
it faster and more corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
--
d
irsta
t
:
Descr
i
be non-o
b
vious differences
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git notes add" mor
e
u
s
er-fr
i
endly when
t
h
e
re
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
log/pretty-opti
o
ns: Docum
e
nt -
-
[
n
o
-
]notes
a
nd depr
e
cate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
b
r
anch/checkout --track: En
s
ure that upstream bra
n
ch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
p
u
sh
.
default
:
Rename 'tracking
'
to 'upstr
e
am
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
P
r
ovide
'
git
m
erge --
a
bort'
as a synonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
cmd_merge(): Parse options befo
r
e
c
hecking MERGE
_
HEA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git n
o
t
e
s
get-ref'
t
o easily retrieve curre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes
m
e
r
g
e: Add testcas
e
s f
o
r
m
er
g
ing notes
t
re
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
g
it no
t
es merge: Add ano
t
her auto-r
e
solving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
g
i
t
n
otes merge: --commit should f
a
i
l i
f
underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
L
ist c
o
nflicting
notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
git n
o
te
s
merge
:
Manual conflict reso
l
ution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
g
i
t notes merge: Manu
a
l conflict resoluti
o
n, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
Documentat
i
on: Preli
m
in
a
ry docs
o
n 'git notes merg
e
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
g
i
t notes merge: Add autom
a
tic
co
n
f
l
i
c
t res
o
lver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it not
e
s m
e
rge:
H
a
ndle
r
e
al,
non-co
n
fli
c
ti
n
g note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/no
t
es
.
c:
R
e
f
actor c
r
eati
o
n of note
s
commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
nd
git notes
m
erge
:
Ini
t
ial implementation handl
i
ng
t
rivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
He
r
lan
d
builtin/notes
.
c: Split
n
otes r
e
f DWI
M
mery i
n
to a se
p
a
r
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herlan
d
notes
.
c: Use two
n
ewlines (
i
nstead of o
n
e) wh
e
n concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(trivial) t3303:
Indent with tabs inste
a
d of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rland
not
e
s
.
h
/c: Pro
p
agate combine_n
o
tes_
f
n return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
h/c:
A
l
l
ow combine
_
n
otes fu
n
ct
i
o
n
s to re
m
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c: Reorder functions in preparation for nex
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
h: Make
defau
l
t_notes_ref(
)
available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
(trivial) notes
.
h: Min
o
r d
o
cumen
t
ation fixe
s
t
o
c
opy
_
no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herla
n
d
n
o
t
e
s
.
c:
Hexify SHA1
in die() message from init_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan H
e
r
land
notes:
D
on't crea
t
e (emp
t
y
)
c
ommit when removing no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Enable cus
t
om sch
e
mes for co
l
umn
colors
in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han
Herland
M
a
ke graph
_
next_lin
e
() avail
a
ble
in the gra
p
h
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
revi
s
ion: Turn
off history s
i
mplification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
on:
F
ix typo in --anc
e
stry-pat
h
e
r
r
or message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n
He
r
l
a
nd
Docu
m
e
ntati
o
n
/
rev-list
-
o
pti
o
ns
.
tx
t
: Explain
-
-ancest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docum
e
n
tation/rev-
l
i
st-options
.
txt: Fix
missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
ha
n
Herlan
d
diff
.
c: E
n
s
u
re "index $from
.
.
$to" lin
e
co
n
tains unambi
g
uo
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan H
e
rland
builtin-notes: Minor (mostly p
a
rse
_
op
t
io
n
s-re
l
ated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han He
r
land
submodule
s
ummary: Don't barf
w
h
e
n
i
nv
o
ked i
n
a
n empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-note
s
:
Add "copy" subcommand
fo
r
copying not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
la
n
d
b
ui
l
tin-notes
:
Mi
s
c
.
ref
a
ctoring
o
f argc a
n
d exit v
a
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
t
in-notes: Add
-
c
/-C opti
o
ns for reu
s
ing
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-no
t
es: Refact
o
r
hand
l
ing
o
f -F option
to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-n
o
tes: Dep
r
ecate
t
he -m/-
F
op
t
ions for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
u
iltin-notes: Add
"
appen
d
" subc
o
mma
n
d for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-no
t
es
:
Add "add" subco
m
m
and
for adding
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Add
--message/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
Add "list" subcomma
n
d fo
r
listi
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herland
D
ocumentation:
Gener
a
l
ize git-n
o
tes
d
o
cs to '
o
b
j
ects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add
"
p
rune" sub
c
ommand 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(): Prune notes that
b
elong
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
t3305:
V
e
r
if
y
t
h
at removin
g
notes triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Add
"
r
emove" subcommand f
o
r removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Teach builtin-notes to
remove empty n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
Te
a
ch notes code to properly preserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3305:
V
erify that
adding man
y
no
t
es
wi
t
h git
-
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
t3
3
01: Ve
r
ify s
u
c
cessful annotation of
n
on
-
commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Bui
l
tin-ify git
-
no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
R
efactor not
e
s concatenatio
n
i
nto
a flexible in
t
e
r
face
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
Notes API
:
Allow multiple con
c
urrent notes trees wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I: write_notes_t
r
ee(): Sto
r
e
t
h
e notes
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
nd
Not
e
s
API
:
f
o
r_each
_
not
e
(
)
:
Tra
v
erse t
h
e
entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes
A
PI: get_note(): Return t
h
e note annotating th
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next