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 2.17.5
2014-11-14
Johan
H
erland
t3
3
0
1
:
mod
e
rnize
s
t
yle
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Jo
h
an Herland
not
e
s: empty
notes should be s
h
own
by 'git log'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan He
r
land
built
i
n/notes:
add --allow
-
empty, to a
l
low stori
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan
H
e
rland
builti
n
/notes: split create
_
note() to clar
i
f
y
add
vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
built
i
n/notes: simpl
i
fy early exit code in a
d
d()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
o
h
an He
r
land
builtin
/
notes:
refactor note fil
e
pa
t
h into s
t
ruct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Joha
n
Herland
bui
l
tin/note
s
: im
p
r
ove
naming
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Jo
h
an Herland
t
3
3
01:
v
erif
y
t
h
at 'git notes' removes empty notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Joh
a
n
H
e
r
land
built
i
n/notes
:
fix
prema
t
ure failur
e
when trying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
Johan He
r
land
Git 2
.
0:
g
it sv
n
:
S
et
d
efault --prefix='origin/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Johan Herland
notes
:
disallow
r
eusing non-blo
b
as a note objec
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Joha
n
Herland
s
h
a
1_file
.
c:create_tmpfil
e
(): Fix race when creating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
git-s
v
n:
W
ar
n
abo
u
t
c
hanging defa
u
lt
fo
r
--pref
i
x in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herlan
d
Doc
u
mentation/git-svn: Promote the use of --p
r
e
f
ix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan Her
l
a
n
d
sam
p
le
pre
-
commit hook
:
us
e
--boo
l
when retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200: Add test
d
emonstratin
g
mino
r
regression in
41
c
21f
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
Herland
Ref
e
r
to branch
.
<name>
.
r
e
mote
/
me
r
g
e when
documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herlan
d
t3200: Minor fix w
h
en
p
reparing for
tracking failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t20
2
4: Fix &&-cha
i
nin
g
and a
c
o
u
p
l
e of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move create_notes_comm
i
t() f
r
om notes-merge
.
c i
n
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
H
e
rland
M
o
ve c
o
py_note_for_
r
ewr
i
te + fr
i
ends from builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herla
n
d
finish_copy_notes
_
for_rewrit
e
(): Let
caller pro
v
ide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
gl
o
ssary: Updat
e
and rephrase t
h
e
defini
t
i
o
n of a r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Validat
e
track
i
ng bran
c
hes
w
i
t
h refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rlan
d
t9114
.
2
: D
o
n't us
e
--track option against "s
v
n-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
7201
.
24:
Add refspe
c
to keep --track worki
n
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3200
.
39: tracking 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
chec
k
ou
t
:
Use re
m
ote refspecs when DWIMming trackin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t2024
:
Show f
a
ilure to use refspec when DWIMm
i
ng remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t2024: Add
tests verifying cur
r
ent DWIM b
e
havior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Her
l
and
git symbolic-r
e
f --delet
e
$symre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix failure
t
o
delete a packed ref through
a
sy
m
r
ef
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
t
1
400-updat
e
-re
f
: Add te
s
t
verifying bug with
symre
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
h
a
n Herland
notes-merge: D
o
n
'
t remove
.
git/NOTES_MERGE_WOR
K
TREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herland
not
e
s-merge: u
s
e opendir/readdir instead
of us
i
ng read
_
d
irec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Herla
n
d
t3310: il
l
u
s
t
r
ate fai
l
ure to "note
s
me
r
g
e --
c
ommit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
fast-import: Fix incorrect
f
a
nout level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joha
n
H
e
rl
a
nd
t9301: Add 2nd t
e
stc
a
se exposing b
u
gs i
n
fast-i
m
p
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Her
l
and
t9301: Fix
t
e
s
t
case cover
i
ng
up a
bug in fa
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herland
t54
0
0: Fix a c
o
uple o
f
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Mar
k
dirstat error messa
g
e
s for t
r
ansla
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Improve error ha
n
dlin
g
whe
n
p
a
r
s
ing
dirs
t
at parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
New --dirstat=lines mode, doing
d
irstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n H
e
rland
Al
l
ow sp
e
ci
f
ying -
-
dirstat
cut-off p
e
rcentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
config v
a
ri
a
ble for spec
i
fyi
n
g
d
efault
-
-dirsta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
R
e
factor --d
i
rstat par
s
ing; depreca
t
e --cum
u
lative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
Herland
Make --
d
irstat=0
output di
r
ectorie
s
t
h
at contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herl
a
nd
A
d
d
several test
c
ases for --d
i
rstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
land
--d
i
rstat: In
c
a
se of rena
m
es, use target f
i
lename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
a
n
d
Teach
--di
r
stat not to completely ig
n
or
e
re
a
rra
n
g
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
h
a
n Herland
-
-dirsta
t
-by-file:
Ma
k
e
it faster and
more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erl
a
nd
--d
i
r
s
tat: Descri
b
e non-
o
b
vious dif
f
erences rel
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Ma
k
e
"
git notes a
d
d" more
user-friendl
y
when th
e
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han He
r
land
log/pretty-options: Document -
-
[
no
-
]no
t
e
s and de
p
reca
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an Herland
branch/chec
k
out --track:
E
nsure that
upst
r
e
a
m branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
H
er
l
an
d
push
.
default: Rename 'tracking'
t
o 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
n
d
Prov
i
d
e
'git
m
erge --
a
bort'
as a synonym t
o
'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
cmd
_
merge(): Parse options before checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
Provi
d
e 'git notes
g
et-ref' to easily
r
etrieve cu
r
rent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge:
A
dd testc
a
s
es
f
o
r
merging
n
ot
e
s
t
r
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merge:
Add ano
t
h
er auto-res
o
l
ving strate
g
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: --com
m
it shou
l
d f
a
il if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
git
n
o
t
es merge: L
i
st conflicting not
e
s in
n
ote
s
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merge
:
Manual conflict
r
e
solution, part
2/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes
m
e
rg
e
:
M
anual conflict resolution, part
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Docume
n
tation: Prel
i
minary
d
ocs on
'git n
o
tes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
git no
t
es m
e
r
g
e: Add automa
t
ic con
f
lic
t
r
e
solvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rland
git no
t
e
s
mer
g
e: H
a
ndle real, non-con
f
lic
t
ing notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Refactor creation of not
e
s co
m
m
its
.
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: In
i
tial impleme
n
tatio
n
handling tri
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
built
i
n/note
s
.
c: Split n
o
tes re
f
DWIMmery into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
c: U
s
e two n
e
wlines (instead of one
)
when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial
)
t3303
:
Indent with tabs inst
e
ad of
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
not
e
s
.
h/c: Propagate combine_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Her
l
and
notes
.
h/c:
Allo
w
combine_notes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herl
a
nd
notes
.
c: R
e
order fu
n
ctions in pr
e
pa
r
ation fo
r
nex
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Her
l
and
note
s
.
h: M
a
k
e
def
a
u
l
t_no
t
es_ref() ava
i
lable in n
o
te
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
an
d
(trivi
a
l
)
no
t
es
.
h:
M
inor documenta
t
io
n
f
i
xes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an H
e
rl
a
nd
notes
.
c: H
e
xify SHA1 in di
e
() message from init_n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herl
a
nd
no
t
e
s
: Don
'
t create (emp
t
y) commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Enable cust
o
m
s
c
hemes
for column colo
r
s
in the
g
r
a
ph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
nd
Make graph_next_li
n
e() availa
b
l
e in the gra
p
h
.
h AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n
H
er
l
and
re
v
ision: Turn
off
his
t
ory simplificati
o
n i
n
--anc
e
stry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Fix typo in
--ancestry-path
e
rror
m
essage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herla
n
d
Docum
e
n
t
ation/rev-lis
t
-options
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
Documentation/rev-li
s
t-
o
ptions
.
t
x
t: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
r
land
diff
.
c: Ensure "index $fro
m
.
.
$t
o
" line co
n
tai
n
s
unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herl
a
nd
builtin-not
e
s:
Minor (mostly parse
_
options-re
l
ated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n Herl
a
nd
submodule
summary
:
Don't ba
r
f
when invoked
i
n
a
n emp
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
buil
t
in-notes:
A
dd "co
p
y"
subcommand for co
p
yi
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes
:
Mi
s
c
.
re
f
actor
i
n
g
o
f
a
rgc
and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes: Ad
d
-
c
/-C options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
b
u
i
ltin-notes:
Refac
t
or handling of -F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
o
tes: Deprecate the -m/-F
o
ptions for
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Add
"
a
pp
e
nd" s
u
bcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin
-
no
t
es: Add "
a
d
d
" subcomm
a
n
d
for adding
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an He
r
land
builtin-
n
otes:
A
dd --message
/
--fi
l
e al
i
ases fo
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
b
uiltin-notes:
A
dd "list" subcommand for list
i
n
g note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Documentation:
G
e
n
eraliz
e
git-notes docs to 'obje
c
ts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
built
i
n-notes
:
Add "p
r
une" su
b
command for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next