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
gitignore.txt: fix documentation of "**" patterns
2013-09-09
Johan Herla
n
d
t3200: Add test
d
emonstrating minor regr
e
s
s
i
o
n in
41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
H
erland
Refer to
b
ranch
.
<name>
.
rem
o
te
/
merge when docume
n
ting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
land
t
3200: Minor fix when preparing for tracki
n
g f
a
ilure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024:
Fix
&
&-cha
i
ni
n
g
and a couple o
f
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
han Herlan
d
Move
cr
e
ate_notes
_
commit() from notes
-
merge
.
c int
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
ohan He
r
land
M
o
ve copy
_
not
e
_for_rewri
t
e + fri
e
nds fro
m
b
uilt
i
n/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n Herland
finish_c
o
py_not
e
s
_
for_rewrite(): Let
caller pr
o
vide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
n
d
glossary
:
Upd
a
te an
d
rephrase the defi
n
iti
o
n of a rem
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan H
e
rland
bra
n
ch
.
c:
Valid
a
te tracking branc
h
es
with re
f
specs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an H
e
rland
t9114
.
2: Don't
u
s
e --trac
k
option
a
gainst "s
v
n-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t7201
.
24: Ad
d
refspec to kee
p
--tr
a
ck working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
H
e
rlan
d
t
3
200
.
39: tracking set
u
p s
h
ould fa
i
l if there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Us
e
remote
refs
p
ec
s
wh
e
n
DWIMming tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
n
d
t20
2
4: Show failure to use refspec
when DWIMming remo
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t202
4
: Add test
s
verifying current DWIM b
e
havior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Her
l
and
git symbolic-ref --delete
$
symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
Fix failure to de
l
ete
a
packed
r
e
f through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-
u
pd
a
te-ref:
Add t
e
st
verify
i
ng
bug w
i
th symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han H
e
rland
not
e
s-merge: Don't
remov
e
.
git
/
NOTES_MERGE_W
O
RKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herl
a
nd
notes
-
merge: use opendir/readdir instead o
f
using
read_
d
i
rec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an
Her
l
and
t331
0
: illu
s
trate
f
ailure to "notes merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
fas
t
-i
m
p
o
rt: Fi
x
inc
o
rrect fanou
t
level when m
o
difying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
Herland
t
9
3
0
1: Add 2n
d
testcase expos
i
ng b
u
gs in fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t9301: Fi
x
t
es
t
case co
v
ering up a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n He
r
land
t5400: Fix a couple of t
y
pos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herlan
d
Mark di
r
s
t
at error me
s
sages fo
r
translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Improve error handling when parsing dirst
a
t
parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
N
e
w --dirstat=line
s
mode, doin
g
di
r
stat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Allow specifyi
n
g -
-
d
i
rstat cut-off percentage
as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
r
land
Add config v
a
riable for
specifying de
f
au
l
t
-
-dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor --dirsta
t
parsing; depr
e
cate --cu
m
ul
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Make --dir
s
ta
t
=0 ou
t
pu
t
directori
e
s t
h
at
contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
H
er
l
and
A
dd several test
c
ases for --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--di
r
s
tat: In case
o
f ren
a
mes, use ta
r
get
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
Teach -
-
d
i
rstat not to completely
i
gnore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
--dirst
a
t
-
b
y
-f
i
le: Make it faster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan He
r
land
--dirstat: Describ
e
non-obvious differences
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
M
ake "git no
t
es add" more user-friendly whe
n
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/
p
r
e
tty-options: D
o
cument --[no
-
]n
o
t
e
s
and
deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
oha
n
He
r
land
br
a
n
ch/
c
heckout --track: Ensure that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
ohan Herland
push
.
default:
R
en
a
me 'trac
k
i
n
g
'
to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an
H
erland
Provide 'g
i
t
merg
e
--abort' as a syn
o
nym to 'git r
e
set
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
cmd_mer
g
e(): Pars
e
options before chec
k
i
ng MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Prov
i
de 'git notes get-ref' to easily
r
e
triev
e
cu
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
gi
t
notes merge: Add testcases for merging not
e
s
tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes
mer
g
e: Add another auto
-
resolving stra
t
egy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
-
-commit
shoul
d
fail if underl
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
g
it n
o
tes merge: List conflicting
n
otes in notes m
e
rge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
lan
d
git
note
s
merg
e
: Man
u
al conflict resolu
t
ion,
par
t
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
g
it notes merge: M
a
nual conflict res
o
lutio
n
,
pa
r
t 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
Doc
u
m
e
ntati
o
n
: P
r
el
i
minary
d
ocs
o
n 'git notes
m
erge
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
erla
n
d
g
i
t
n
otes merge: Add au
t
omatic conf
l
ict re
s
olve
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git
n
o
tes merge: Ha
n
dle real,
n
on-c
o
nflic
t
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bui
l
tin/no
t
es
.
c: Refactor creation
o
f
no
t
es com
m
its
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes me
r
ge: Initial
i
m
plemen
t
a
tion han
d
ling t
r
ivia
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
builtin/notes
.
c: Split n
o
te
s
ref DWIMmery
i
n
to a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
er
l
and
notes
.
c: U
s
e t
w
o newlines (instead of
one) whe
n
concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
(
t
r
i
vial
)
t
3
30
3
:
I
n
dent with tabs instead of
s
pac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n
Herland
notes
.
h/c: Propagate combine_notes_fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
h/
c
:
Allow combine_note
s
fu
n
ctions t
o
remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an Herla
n
d
notes
.
c: Reo
r
der functions in prepara
t
ion for ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Her
l
and
n
o
tes
.
h
:
Make default_not
e
s_ref() available in n
o
tes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
(trivial) notes
.
h: Mi
n
or documenta
t
i
on fix
e
s to cop
y
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
c:
H
exify SHA1 in
d
i
e()
m
e
s
s
a
ge from i
n
it_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n
H
erla
n
d
note
s
:
D
on't create (emp
t
y) co
m
mit when
removin
g
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
ohan
H
erland
Enabl
e
custom schemes for column
co
l
ors
i
n
t
he
g
r
aph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rland
Make graph_next_line() available i
n
the graph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revisi
o
n
:
T
urn off history simplification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revis
i
o
n
: Fix typo in --anc
e
stry
-
path error
mess
a
ge
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
Documentation/rev-list-options
.
t
xt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
a
n
d
Documentation/rev
-
lis
t
-options
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
d
iff
.
c
:
E
ns
u
re "index $from
.
.
$
to" li
n
e co
n
tains unambi
g
u
o
us
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herla
n
d
builtin
-
n
o
te
s
:
Minor (mostly
p
arse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
ohan Herland
submodule summary: Do
n
'
t ba
r
f
when invoked in a
n
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes:
A
d
d "copy" subcom
m
and fo
r
copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
bu
i
ltin
-
notes:
Misc
.
r
efactoring of argc
a
nd
exi
t
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
bui
l
tin-notes: Add -c/-C
o
ption
s
for re
u
s
i
ng notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
b
uiltin
-
n
o
tes: Refactor handli
n
g of -F option to
a
llow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
builtin
-
no
t
es: Dep
r
ecate the -m/-F
o
ptions for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-n
o
tes: Add "a
p
pend" s
u
bcommand for appendin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin
-
notes: Add
"
add" sub
c
o
mmand
f
or
a
d
ding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes
:
Add --messa
g
e/--fi
l
e aliases
f
or -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
uilti
n
-notes: Add "lis
t
" s
u
b
command for
l
i
s
ting
n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
r
land
D
ocumentation: Gene
r
ali
z
e
g
it-notes
docs to
'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s: Add "pru
n
e" subcommand for
r
e
movi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: prune_no
t
es
(
):
Prune no
t
es that
belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t3
3
05
:
Verif
y
that r
e
m
oving notes
t
r
i
ggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
builtin-notes:
A
dd "remove" subcomma
n
d f
o
r removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Teach builtin-notes to remove empty
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach not
e
s code to properly
pre
s
erve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
t3305: Verif
y
that a
d
ding
m
an
y
notes
with git-note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
t3301
:
Ver
i
fy succ
e
ssf
u
l annotation of
non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
Builtin-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Refact
o
r notes concatenation into a fl
e
xibl
e
interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es API: All
o
w mu
l
ti
p
le concurrent n
o
tes trees w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
Notes
A
P
I
: write
_
notes_tree(): Sto
r
e the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
e
r
land
N
otes API: for_each_
n
ote(): Traverse t
h
e enti
r
e notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Note
s
AP
I
: get_
n
o
te(): Return th
e
note annota
t
ing
t
he
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
N
o
t
es API: r
e
move_note():
R
emove note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
API: add
_
no
t
e
(
)
: Add note
obje
c
ts to the int
e
rnal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next