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
Sync with v2.2.1
2014-11-14
Johan H
e
r
l
and
t
3
301: moderniz
e
style
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan H
e
r
l
and
n
ot
e
s: empty notes should be shown by 'git lo
g
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Joha
n
Herland
bui
l
tin/notes: add --a
l
low-empty,
t
o
allow stori
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
bui
l
tin/
n
otes: split create_note() to cl
a
rify
a
dd
vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Jo
h
an Her
l
and
builtin/notes:
s
implify ear
l
y ex
i
t co
d
e in add()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
oh
a
n Herland
b
u
iltin/notes: refactor note file path into struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
builtin/notes:
i
mprove
n
aming
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Jo
h
an Herland
t330
1
: v
e
rify that 'git not
e
s' r
e
moves emp
t
y note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Joha
n
Herland
b
u
ilt
i
n/n
o
tes
:
fix premature f
a
ilure
w
hen trying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
J
ohan Herland
Git 2
.
0: gi
t
svn: Set de
f
ault
--
p
refix='origin/'
if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
J
o
ha
n
Herland
no
t
e
s: disallo
w
reusing
n
o
n
-bl
o
b
as
a
note object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Johan Herlan
d
sha1
_
file
.
c:create_tmpfile(
)
: Fix ra
c
e
when
c
reating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
g
it-svn: Warn about chang
i
n
g default for --p
r
efix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
J
ohan Herland
Do
c
umentation
/
git-svn: Promote the use of --prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Jo
h
an Herland
sampl
e
pr
e
-commi
t
hook:
u
s
e --bool wh
e
n
r
etrie
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Herland
t3200:
A
dd test demonstr
a
ting minor regres
s
i
on in 41
c
2
1f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herl
a
nd
Refer to bran
c
h
.
<name>
.
remote/merge when do
c
umenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erla
n
d
t
3200
:
Minor fix w
h
en pr
e
parin
g
for tracki
n
g fai
l
u
r
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Herland
t2
0
24: Fix &&-chaining an
d
a co
u
ple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an
Herland
Move creat
e
_note
s
_co
m
mit() from note
s
-
merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n Herland
Move copy_note_for_rewrite + friend
s
from builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
ohan Her
l
a
n
d
fini
s
h_copy_n
o
tes_fo
r
_rewrite(): Let
c
aller provi
d
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
glo
s
sa
r
y: Upda
t
e a
n
d rephrase the
defi
n
i
tion of a
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
b
r
anch
.
c: Validate tracking branches
w
ith refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t911
4
.
2: Don't use --track option
against
"s
v
n-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
He
r
land
t7201
.
24
:
Add refspec t
o
k
e
ep --track
w
ork
i
ng
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
He
r
lan
d
t3200
.
3
9: track
i
ng setup should fail if there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
checkout: Use remot
e
refspecs when DWIMming tr
a
cking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Show failure
t
o use ref
s
pec when DWIMm
i
ng remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t202
4
: Add tests verifying
c
urrent DWIM
behavio
r
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
lan
d
gi
t
symb
o
lic-ref --delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Her
l
a
n
d
Fix f
a
i
lure to delete a pac
k
ed ref throu
g
h a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Her
l
and
t1400-up
d
ate-ref: Add test verif
y
ing bu
g
w
ith symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merg
e
: Don't remove
.
git/NOTES_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
no
t
es-me
r
ge: use o
p
endir/r
e
ad
d
ir instead of
u
sing read
_
direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310: illustrate fai
l
u
r
e to
"not
e
s merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan He
r
land
fast-impor
t
: Fix incorrect fanout l
e
vel when m
o
difying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t9301: Add 2n
d
testcase ex
p
osing bugs in f
a
st
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix testcase covering up a bug in fas
t
-im
p
o
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
Herla
n
d
t5400
:
Fix a cou
p
le of t
y
p
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Mark
d
irstat error messages for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rlan
d
Imp
r
ove
e
rror handling w
h
en parsing dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ne
w
--dirstat=lines mode, d
o
ing d
i
rsta
t
a
n
alysi
s
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Allow spec
i
fying --di
r
stat cut-off pe
r
centa
g
e as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han He
r
land
Add config variable for sp
e
cifying default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Ref
a
ctor -
-
dirstat pars
i
ng
;
depre
c
ate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make --dirst
a
t=0 output directories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
A
d
d several
t
estcases for --dirstat and
f
riends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
H
erland
--di
r
sta
t
: In cas
e
of renames, use
t
arge
t
f
i
lename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
Teach --dirs
t
at n
o
t to comp
l
etely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
-
-
di
r
stat-by-file: M
a
ke it faster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe non-o
b
v
i
ous differences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herla
n
d
Make "git notes a
d
d" more user-frie
n
dl
y
w
h
e
n
t
h
e
re
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty-options: D
o
cum
e
nt --[n
o
-]notes and dep
r
ecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Her
l
a
nd
branch/c
h
e
c
kout --track: Ensure t
h
a
t upstream
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herlan
d
push
.
d
e
fa
u
lt:
R
ename 'tracking'
to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rl
a
nd
P
r
ovide 'git merge --abort' as a s
y
nony
m
to
'g
i
t reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
c
m
d_me
r
ge(): Parse options
b
e
fore checking M
E
RGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herla
n
d
P
r
o
vide
'
g
i
t notes get-ref' to easily retrieve curr
e
nt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
gi
t
notes merge: Add
t
e
stcases f
o
r me
r
g
i
n
g n
o
tes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add
a
nother auto-
r
esolving str
a
teg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
git
notes merge: --c
o
mmit should fail
if u
n
derlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes m
e
r
g
e
:
List conflicting notes i
n
notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es merge
:
Ma
n
ual conflic
t
resolution,
p
a
r
t 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Her
l
and
git note
s
m
e
rge:
M
a
n
u
a
l c
o
nflict
res
o
lution
,
part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
Documentation: Prelimin
a
ry docs on
'
g
it notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge: Add automa
t
ic conf
l
ict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
git
n
o
t
e
s merge:
H
and
l
e
real,
n
on-confl
i
cti
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
b
u
iltin/
n
o
t
es
.
c: Refactor cre
a
tio
n
of note
s
commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes merge: Initial implementatio
n
handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
builtin
/
n
o
t
es
.
c
:
S
plit
n
ot
e
s
ref DWIMmery i
n
to a sep
a
rate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
notes
.
c: Use two n
e
w
lines (instead of one) when
c
o
ncatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(triv
i
al) t3303: Inde
n
t
with tabs
instead o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erland
no
t
es
.
h
/
c: Propagate com
b
ine_n
o
t
e
s_fn r
e
t
urn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h
/c: A
l
low
comb
i
ne_n
o
tes functions
to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
H
e
rland
notes
.
c: Reo
r
de
r
f
u
n
ctions in preparation f
o
r next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
not
e
s
.
h: Make defa
u
lt_not
e
s_
r
ef() available in no
t
es API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an H
e
rland
(
t
rivial) notes
.
h: Minor documentation fixe
s
to copy_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
n
ot
e
s
.
c: H
e
xify SHA1 in die()
m
ess
a
ge fr
o
m init_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herl
a
nd
notes
:
Don't cre
a
te (empty) commit wh
e
n removing no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n
Her
l
and
E
nable
custom schemes f
o
r col
u
mn colors i
n
the gr
a
ph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herlan
d
Make g
r
aph_
n
ex
t
_lin
e
() available
i
n the graph
.
h AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Tu
r
n
off history simplification in -
-
a
n
cest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herla
n
d
r
ev
i
sion: Fix typo in --
a
ncestry-pa
t
h
error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herlan
d
Docu
m
entatio
n
/
r
ev-li
s
t-optio
n
s
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
Documenta
t
i
o
n/rev-
l
i
st
-
opt
i
ons
.
txt: Fi
x
m
issing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
an Herland
diff
.
c: Ensur
e
"index $from
.
.
$
to"
l
ine contains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Her
l
a
nd
builtin-notes:
M
inor (mostly par
s
e_options-rela
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodul
e
summa
r
y: Don't barf when invoked
i
n
an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
builti
n
-notes: Add "copy"
s
ubco
m
mand for
copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n
-notes: Misc
.
refact
o
ring of arg
c
and
e
x
it value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
buil
t
in-n
o
tes
:
Add
-
c/-C options for
reus
i
ng notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
H
erland
builtin-no
t
es:
Refac
t
o
r handling of -F o
p
ti
o
n
t
o allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
builtin-n
o
tes: Deprecate the -m/-
F
o
p
tions for
"g
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes:
Add "a
p
pend" sub
c
ommand fo
r
a
p
p
e
nding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
builtin-notes: Add "add
"
sub
c
ommand fo
r
addin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
b
ui
l
tin-notes: Add
-
-message/--file al
i
ases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
b
u
iltin-notes: Add "list" sub
c
ommand for listing not
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Documentation: Ge
n
eralize gi
t
-n
o
tes docs
t
o
'
o
bject
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
builtin
-
n
o
tes: Add
"
prun
e
" subco
m
mand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next