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 'rs/maint-config-use-labs'
2014-11-14
Johan Herland
t3301:
m
oderni
z
e
s
tyle
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
n
otes: empty no
t
e
s
should be sh
o
wn by 'git log'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
builtin/n
o
tes
:
add --
a
llow-empty, to all
o
w storin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Jo
h
an Herland
bu
i
l
t
in/not
e
s: s
p
lit create_
n
o
te() t
o
clarify add
vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herlan
d
builtin/notes: simplify early exit
c
o
de
i
n add()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Joh
a
n Herland
builtin/no
t
es: refactor note fi
l
e path into struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan
H
erland
builtin/
n
o
t
es: improve na
m
i
n
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Jo
h
an Her
l
and
t3301: verify that 'git notes' rem
o
v
e
s
empty note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Jo
h
an Herland
builtin/notes:
fix premature failure w
h
e
n tryi
n
g to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Joh
a
n Herland
Git 2
.
0:
g
it
s
vn: Se
t
default --prefix='origin/'
i
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Joha
n
Herland
notes: dis
a
l
low
reusing non-b
l
o
b
as
a note objec
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Johan He
r
land
sha1_file
.
c:cre
a
te_tmpfile(): Fix
r
a
c
e
when creating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
g
it-svn:
W
arn a
b
out changing defa
u
lt for --prefix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
J
ohan Herland
Documentati
o
n/git-s
v
n
:
Pro
m
ote the use of --pr
e
f
ix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan Herlan
d
sam
p
le pre-commit hook
:
use -
-
bool w
h
en retrie
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t
3200: Add te
s
t de
m
onstrating
minor regression in
41c
2
1f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
Herlan
d
Refer to branc
h
.
<name>
.
remote/merge wh
e
n
documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
ohan Herland
t3200: Mino
r
f
i
x w
h
en preparin
g
f
o
r trac
k
i
n
g fa
i
lu
r
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024: Fix &&-chaining
an
d
a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
land
M
o
ve crea
t
e_notes_
c
ommit() from notes-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
Move copy_note
_
for_rewrite +
friends from builtin/
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Her
l
and
finish_copy_notes_for_r
e
wr
i
t
e(): Let
c
aller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
H
erland
glossary: Update and rephrase the definition
of a
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
b
r
a
nc
h
.
c: Val
i
date track
i
ng branches with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n He
r
lan
d
t
9
114
.
2: Don't u
s
e
-
-track option aga
i
nst "s
v
n-rem
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t720
1
.
24: Add refsp
e
c
to keep --track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herl
a
n
d
t3200
.
39
:
trac
k
i
n
g setup should fail if there
i
s n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
er
l
and
che
c
kout: Use r
e
mote refspe
c
s when DWIMming track
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
t20
2
4
: Show failure to u
s
e refs
p
ec
when DWIMming r
e
mot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herlan
d
t2024: Add tes
t
s verifying c
u
r
rent DWIM be
h
avior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
a
n
Herland
git s
y
m
b
oli
c
-ref
-
-
delete
$
symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
la
n
d
Fix
failure to delete a pa
c
ked ref th
r
ou
g
h a
s
ymref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herland
t
1
400-update-ref:
A
dd t
e
st veri
f
ying b
u
g
w
it
h
s
y
mrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-
m
erge
:
Don't remove
.
git/N
O
TES_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
n
otes-merge: use
o
p
e
ndir/readdir instead of usin
g
read_
d
irec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herland
t
3
3
10: illustrate failure to
"
not
e
s merge
--commi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
He
r
l
a
nd
f
a
s
t
-im
p
or
t
: Fix incorrect
f
anout
l
evel when mod
i
fying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rl
a
nd
t
9301:
Add 2nd testcase
e
x
posing bug
s
in fast-imp
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
t9301: Fi
x
t
e
stcase covering up a bug in fa
s
t-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan He
r
la
n
d
t
54
0
0: Fix a couple o
f
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
M
ark dirstat error messa
g
es
for tra
n
s
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
I
m
p
r
o
v
e
err
o
r handlin
g
whe
n
parsing
d
irstat p
a
rameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
New --dirstat=
l
in
e
s mode, d
o
in
g
d
i
rstat analy
s
i
s
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
All
o
w s
p
ec
i
f
ying --dirstat cut-off percentage
a
s a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add co
n
fig va
r
iable for specifying default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Refactor --dirst
a
t parsing; deprecate --cumulat
i
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
Herlan
d
Make --dirsta
t
=
0
out
p
ut directories that cont
r
ibute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
H
er
l
and
Add several testcases for
--d
i
rst
a
t and frien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
-
-
dirstat: In case of renames, u
s
e
target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dirs
t
at
not to completely ign
o
r
e
rearrang
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
-
-di
r
sta
t
-b
y
-file:
M
ake it faster and more c
o
rrect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe non-ob
v
iou
s
differenc
e
s r
e
lative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herlan
d
Make "git notes add" more user-friendly
when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n
Herlan
d
l
og/pretty-
o
p
t
i
o
ns: Document --[n
o
-]note
s
and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
Her
l
an
d
branch/checkou
t
--tra
c
k: En
s
ure that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Jo
h
an Herland
push
.
d
efault: Rena
m
e 'track
i
n
g' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Provide 'git merge --abort' a
s
a synonym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
land
cmd_merge():
Parse options
before c
h
ecking
MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
er
l
and
P
r
ovi
d
e 'git n
o
tes get
-
ref
'
to easily retrieve c
u
r
r
e
nt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes merge: Add testcases
f
o
r
mergin
g
not
e
s trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herlan
d
git n
o
te
s
mer
g
e: A
d
d
a
n
othe
r
a
u
to-resolving
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: -
-
commit shoul
d
fail if u
n
derlyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
it notes merge: List conflicting notes
i
n notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git notes merge:
M
anual
conflic
t
resolution,
p
a
rt 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
git notes mer
g
e
: Manual conflict resol
u
t
i
o
n, part
1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Do
c
umentat
i
on: Prelimi
n
ary docs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n Herland
gi
t
n
o
tes mer
g
e:
Add automa
t
ic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
gi
t
no
t
e
s m
e
rge: Handl
e
real, non
-
conflict
i
ng
n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
builtin/notes
.
c: Refactor
c
reati
o
n of no
t
es commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merg
e
: Initial implementati
o
n handlin
g
t
riv
i
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erland
built
i
n/
n
otes
.
c: Split notes ref
DWIMmery into a separat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rlan
d
notes
.
c: Use two newlines (instead
o
f one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
rl
a
nd
(trivi
a
l) t3
3
0
3
: In
d
ent with
t
abs instead o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rlan
d
note
s
.
h/c: P
r
o
p
aga
t
e combine
_
notes_
f
n
r
e
tu
r
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
erlan
d
n
otes
.
h/c
:
Allow comb
i
ne_
n
ote
s
f
u
nctions to remov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
e
rland
notes
.
c:
R
eord
e
r functions i
n
preparation for
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h:
Make default_n
o
tes
_
ref() ava
i
l
a
ble in notes AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h:
Mi
n
or document
a
tion fix
e
s to copy
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herl
a
nd
notes
.
c
:
H
exify SHA1 in
d
ie() message from init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n Herland
notes: Don't create (em
p
ty
)
comm
i
t when removi
n
g non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rland
Enable custom schemes for column c
o
lo
r
s
i
n
the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
Make
g
ra
p
h_next_l
i
ne()
available in the graph
.
h
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revisi
o
n: Turn of
f
history simpli
f
ication in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix typo in --ance
s
try-p
a
t
h
e
rror m
e
ssage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
rland
Documentat
i
on/rev-list
-
options
.
txt: Ex
p
lai
n
--anc
e
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Doc
u
mentation/re
v
-list-options
.
tx
t
: Fix m
i
ss
i
ng li
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan He
r
land
d
i
ff
.
c
:
En
s
ure "
i
ndex $from
.
.
$to" line contains un
a
mbiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
H
erl
a
nd
builti
n
-n
o
tes
:
Minor (mostly parse_options
-
related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodul
e
summary: Don't barf when invoked i
n
an
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
He
r
lan
d
builtin-n
o
tes: Add
"copy" subco
m
mand for copyin
g
not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
b
uiltin-notes
:
M
i
sc
.
refactoring of ar
g
c and exit
v
a
lue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-n
o
tes: Add -c/-C opt
i
ons
f
or reusing note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
b
u
iltin-n
o
te
s
:
R
ef
a
ctor hand
l
ing of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an He
r
land
builtin-notes: Deprecate the -m/-
F
opt
i
ons for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builti
n
-notes: Add "appe
n
d" subco
m
mand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
built
i
n-notes:
Add "add" sub
c
ommand for ad
d
ing no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
bu
i
ltin-notes: Add -
-
me
s
sag
e
/--f
i
le
aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
b
u
iltin-notes: Add "li
s
t
"
subcomman
d
for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Documentatio
n
: Gen
e
ra
l
ize git
-
notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herla
n
d
builtin-note
s
: A
d
d
"p
r
un
e
" subcomm
a
n
d
f
o
r
re
m
ov
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next