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
Merge branch 'hu/cherry-pick-previous-branch'
2013-10-12
Joha
n
H
e
r
l
an
d
git-
s
vn: Warn abo
u
t c
h
anging default for --
p
refix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
J
o
han
Herland
Documentatio
n
/
g
i
t
-svn
:
Promote t
h
e u
s
e of --prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Joh
a
n Herland
s
ample pre-commit h
o
ok: u
s
e --b
o
o
l when
r
etrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herland
t32
0
0: Add test demonstr
a
ting
minor regression in 41c
2
1f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Her
l
a
nd
Refer to bran
c
h
.
<name>
.
remote
/
merge when d
o
c
um
e
nti
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
h
an
H
erland
t3200: Mi
n
o
r
f
i
x
w
hen
p
reparing for tracking f
a
ilure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Herland
t
2
024:
F
ix &&-chain
i
ng a
n
d
a
c
oup
l
e of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move cr
e
ate
_
n
o
t
e
s_com
m
it() from notes-merge
.
c i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Mov
e
copy_note_for_rewrite + friends fro
m
b
u
iltin/n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finis
h
_c
o
py_notes_for
_
rewri
t
e
(
): Let ca
l
le
r
pro
v
ide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
gl
o
s
s
ary:
U
pdate
and
r
ephra
s
e
t
he definit
i
on of a re
m
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Valida
t
e tr
a
cking bran
c
hes with
r
e
fspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2
:
Don't use --track op
t
i
on against "sv
n
-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
er
l
and
t7201
.
24
:
A
d
d
r
efspec
to kee
p
--t
r
ack working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n H
e
r
land
t32
0
0
.
39:
t
racking setup shoul
d
fail if there
is
n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checko
u
t: U
s
e
r
e
mote refspecs when DWIMming tr
a
cking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t2024: Show failure to use
refspec when DWIM
m
i
n
g r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
e
rland
t20
2
4: Add tests verifying c
u
rrent DWIM be
h
avior
o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
H
erland
git symbolic-ref --delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
a
n
Herland
Fi
x
failure to delete a
packed ref through
a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-update-
r
ef:
Add test v
e
rifying
bug w
i
th symr
e
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
no
t
e
s
-
merge: Don
'
t
remove
.
git
/
NOTES_MER
G
E_WO
R
K
T
REE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
n
ote
s
-
m
erge: use
opendir/readdir ins
t
ead of
u
s
i
ng read
_
dir
e
c
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
H
e
rland
t
3
31
0
: illustrate failure to "no
t
e
s
merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
fas
t
-
i
mpor
t
:
F
ix incor
r
ect fano
u
t level whe
n
modify
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han
H
e
rland
t93
0
1: Add 2nd testcase
exposin
g
bugs in
f
ast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
t9301: Fix
t
estcase coveri
n
g
up a bug
i
n f
a
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t54
0
0: Fix a
c
ouple of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Mark
d
i
r
stat error messages for translatio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Improve error handling
when parsing d
i
rstat param
e
ters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Her
l
and
New --dirsta
t
=l
i
nes mode
,
doi
n
g d
i
r
sta
t
a
nal
y
sis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han H
e
r
land
Allow specifying --dirstat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
er
l
and
Add config variab
l
e
f
or specifying defa
u
lt --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
er
l
and
Refactor --d
i
r
stat parsin
g
; d
e
p
recate
-
-cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an Herland
Make --dirstat=0
o
utput directories
t
hat c
o
ntribut
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han He
r
l
a
nd
Add several testcases fo
r
--dirstat and fr
i
ends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
-
-
d
irstat:
I
n case
o
f renames, use ta
r
g
et filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
T
each --d
i
r
s
tat
n
ot to
c
ompletely ignore rearran
g
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herla
n
d
--dirstat-by-fi
l
e:
Ma
k
e
i
t
fas
t
er and more cor
r
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
--dirstat: Describe non-obvious differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herla
n
d
Make "git not
e
s a
d
d" m
o
re user-frien
d
ly when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pr
e
tty-o
p
t
i
ons: Document --[no-
]
not
e
s a
n
d
d
e
pr
e
c
ate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
erland
bran
c
h/checkout --trac
k
:
E
nsure tha
t
u
p
st
r
e
am branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
d
efau
l
t: Rename 'tracki
n
g'
t
o 'ups
t
ream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provi
d
e
'git m
e
rge --abort' as a synony
m
to 'git re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herlan
d
cm
d
_
m
erge()
:
Pa
r
se
o
ptions befor
e
che
c
ki
n
g M
E
R
G
E
_HEA
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git notes get-ref' t
o
eas
i
ly r
e
triev
e
cur
r
ent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
git
n
otes
m
erge: Add testcases f
o
r
m
erging
notes
t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it note
s
m
erge: Ad
d
anoth
e
r
a
uto-r
e
solving strate
g
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
n
otes
merge:
-
-commit should fa
i
l
i
f unde
r
l
y
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
land
git notes merg
e
: List conflic
t
ing notes in not
e
s merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
nd
gi
t
notes merge: Manual confl
i
ct resolution, p
a
rt 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git note
s
merge:
Manual con
f
lict res
o
lut
i
on, par
t
1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erl
a
nd
Documenta
t
io
n
: P
r
eliminary
docs on 'git notes me
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git note
s
merge: Add autom
a
tic confli
c
t r
e
solv
e
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herlan
d
g
i
t
not
e
s merge: Handle real, no
n
-c
o
nflicting
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
a
n
d
buil
t
in/not
e
s
.
c: Refactor
c
r
eation of n
o
tes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
land
git notes merge
:
Ini
t
ial implementatio
n
handl
i
ng trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Split not
e
s ref
D
WIMmery i
n
to a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
note
s
.
c: Use two newlines (instead of one
)
when
c
oncatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
(t
r
i
v
ial) t3303
:
Indent with tabs i
n
stead of
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
notes
.
h/c:
P
ropagate
c
ombine_notes_fn re
t
ur
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h
/
c: A
l
low com
b
ine_notes f
u
nctions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
Herland
notes
.
c: R
e
order functions in
pre
p
a
r
ation fo
r
n
e
xt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Her
l
and
notes
.
h: Make default_notes_ref() ava
i
lable i
n
no
t
es API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
(triv
i
al) notes
.
h: Mino
r
documentation fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
c: Hexify
S
HA
1
in die() mess
a
ge from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
oh
a
n Herland
notes: Do
n
't
create (em
p
ty
)
c
ommit when removing
n
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
ohan Herland
Enable c
u
stom schemes for col
u
mn colors in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
M
ake graph_nex
t
_li
n
e
(
) av
a
i
l
a
b
le in the graph
.
h A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revi
s
ion:
Turn
o
ff
h
i
s
t
or
y
simplifica
t
ion in --ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revisi
o
n: Fix
t
y
p
o in
-
-ances
t
ry-path error mes
s
age
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han H
e
rland
Docu
m
entation/rev-list-options
.
txt: Ex
p
l
ain --a
n
cest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
oc
u
mentation/rev-lis
t
-opt
i
ons
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan
He
r
land
diff
.
c: Ensure "index $
f
rom
.
.
$to"
l
i
ne co
n
tai
n
s unambigu
o
us
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han He
r
land
b
ui
l
ti
n
-notes:
M
inor (
m
os
t
ly parse_o
p
tions-r
e
lated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan He
r
la
n
d
s
u
bmodul
e
summary:
Don't
b
arf when in
v
oked
in an e
m
pty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uilti
n
-
n
otes:
A
d
d "cop
y
" subco
m
mand for c
o
pyin
g
no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
bu
i
ltin-no
t
es: Misc
.
refactoring of argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
ilti
n
-notes: A
d
d -c
/
-C option
s
for re
u
sing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes:
R
efactor handling of -F op
t
ion
to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
builti
n
-notes:
D
eprecate t
h
e -m/-
F
options for
"
git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
not
e
s: Ad
d
"append" subcom
m
a
n
d
for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
built
i
n
-notes: Add "add" subcommand for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd --message/
-
-file alias
e
s
f
or -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
builtin-notes:
Add "list
"
sub
c
o
m
mand for listing n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Documentation
:
G
enerali
z
e git-notes do
c
s
t
o
'ob
j
ects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
buil
t
in-notes:
A
d
d "prune" s
u
bco
m
mand for removi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes API: prune_notes():
P
rune notes that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Her
l
a
nd
t3305: Ve
r
ify that r
e
mov
i
ng notes triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
rland
builtin-not
e
s: Add "remove" subcomm
a
nd for removin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Teac
h
builtin-notes to remove em
p
t
y
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
T
each notes code to properly
pr
e
serve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
t3305
:
Ver
i
f
y that addin
g
many notes wi
t
h
g
i
t
-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
t33
0
1: Verify
successful annotation of
no
n
-commit
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
H
erland
B
u
i
l
t
i
n
-if
y
git
-
no
t
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
Refactor no
t
es
concatenat
i
o
n int
o
a flexibl
e
i
nterface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: All
o
w
multi
p
le
c
oncurrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
Notes API: write_note
s
_tree(): Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
N
o
tes AP
I
: for_each_not
e
(): Traverse
t
he entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next