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
pager: set LV=-c alongside LESS=FRSX
2013-10-28
Johan
H
erlan
d
sha1_file
.
c:create_
t
mpfile(
)
:
F
ix race
w
h
en cr
e
atin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
git-svn
:
Warn
about
c
h
angi
n
g de
f
ault for --prefix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herl
a
nd
Documentation/git-svn: Promo
t
e the use of -
-
prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan Her
l
and
sample pre-
c
ommit hook
:
use -
-
bool when r
e
trie
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
nd
t3200: Ad
d
te
s
t
demo
n
strating minor regression in 41
c
2
1
f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
erland
R
e
fer
to branch
.
<name>
.
remote
/
merge when documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Her
l
and
t3200: Minor fix whe
n
preparing
for
t
rackin
g
failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han Herland
t2024: Fix &&
-
chain
i
n
g
and a cou
p
le of
t
ypos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joh
a
n Her
l
and
Move
c
reate_notes_commit() fro
m
n
o
tes-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 +
f
riends from
builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_co
p
y_notes_for_rewrite(
)
: Let c
a
ller
pr
o
vide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
er
l
and
glossary
:
Updat
e
a
n
d
rephrase the definition of a rem
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
H
e
rland
branch
.
c:
V
al
i
da
t
e tracki
n
g bra
n
ches
w
ith refspec
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2: Don't use --
t
rack option ag
a
inst "s
v
n
-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Her
l
and
t7201
.
24: Add refspec to keep --t
r
a
c
k
wor
k
i
n
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t
3
200
.
39: tracking
s
etup should fa
i
l
if there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
check
o
ut: Us
e
r
e
mote refspecs whe
n
DW
I
Mmin
g
tra
c
king
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t2024: Show failure to
u
se ref
s
p
ec when DWIMming remot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t2024: Add tests verifying current DW
I
M b
e
h
avior o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herl
a
nd
git
s
ymbolic-ref
--delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herlan
d
Fix failure to delete a packed ref through a
symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n H
e
rland
t
1400-update-ref:
A
d
d
test v
e
rifying bug w
i
th symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan
H
erla
n
d
not
e
s
-me
r
ge: Don't remove
.
git
/
NOTES_
M
E
R
GE_WORK
T
R
E
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
n
o
t
es-merge: use ope
n
dir/
r
ea
d
dir
i
ns
t
ead o
f
using read_dire
c
.
.
.
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
ure
to
"
n
otes merge
-
-
co
m
m
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
fast
-
i
mport: Fix incorrect
f
a
n
out level wh
e
n
m
odifyi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rland
t9
3
01: A
d
d 2nd
t
es
t
case
exposing bugs in fast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t93
0
1: Fix
t
estcase covering
u
p a bug
in fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n H
e
rland
t
5
40
0
:
F
i
x a coupl
e
of
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an
H
e
rland
M
ark dirstat e
r
r
or messages for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan H
e
rland
Improve error han
d
li
n
g
when par
s
i
n
g dirstat pa
r
ameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
N
ew --d
i
rstat
=
lines mode, doing dirstat an
a
lysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Al
l
ow specifying -
-
di
r
st
a
t cut-off
per
c
enta
g
e as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herla
n
d
Add config variab
l
e
f
or spe
c
ifying defaul
t
--dir
s
tat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
R
e
factor --
d
i
rstat
p
arsing; de
p
re
c
a
te -
-
cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Make --dirstat=0 outp
u
t
direct
o
r
i
es tha
t
con
t
r
i
bute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Add seve
r
a
l
te
s
tcases for --dirstat and
f
r
iend
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
l
a
nd
-
-
dirstat: In c
a
s
e of rena
m
es,
u
se target f
i
l
e
n
a
m
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dirs
t
at not to complete
l
y ignore rearr
a
nge
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
-
-dirsta
t
-
b
y
-file: Make it faster and
m
ore correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
a
n
H
e
r
l
a
nd
--dirstat: Describe non-obvious d
i
f
ferences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herlan
d
Make "
g
it notes add" more use
r
-friendly whe
n
t
h
ere
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
lo
g
/p
r
et
t
y
-
o
pt
i
ons: Document --[no-]no
t
es an
d
deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checkout -
-
track: Ensure
t
hat
upstream
b
r
anch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herla
n
d
push
.
de
f
au
l
t: Rename 'tracki
n
g' to 'upst
r
e
am'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
Provide 'git mer
g
e --
a
bort
'
a
s a synonym to '
g
it
r
es
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
cmd_merge(): Parse
o
p
ti
o
ns bef
o
re checkin
g
MERG
E
_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git
notes get-ref' to e
a
sily retrieve
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
lan
d
gi
t
notes merg
e
:
Add
testcases for merging not
e
s
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
a
n
d
git notes
m
erge: Add
a
noth
e
r auto-resol
v
in
g
strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erland
git notes merge:
-
-commit should fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git n
o
t
es me
r
ge: List conflicting not
e
s in notes me
r
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git
no
t
es merge: Manua
l
c
o
nflict resolution,
part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes merg
e
: M
a
nual conflict resolut
i
on, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
D
o
cumentat
i
on
:
Pr
e
liminary do
c
s on
'
git
n
o
t
e
s
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herland
g
i
t notes
merge: Add automatic
c
onflict resolver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n Herla
n
d
git notes merge:
Handl
e
real, non
-
conflicting n
o
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
builti
n
/
no
t
es
.
c: Refactor creation of notes commit
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes merge: In
i
tial
i
mple
m
entation handl
i
ng tri
v
ial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
nd
b
uiltin/notes
.
c: Split
n
otes ref
D
WIMmery
i
nto a s
e
p
a
rate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
c: U
s
e
t
w
o
n
ew
l
ines (instead of one) when conc
a
t
ena
t
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(tri
v
ial) t33
0
3: I
n
d
e
n
t with tabs instead of spa
c
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c
:
Propaga
t
e combine_n
o
te
s
_
fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan He
r
land
notes
.
h/
c
: Allow
combine_notes functions to remov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
no
t
e
s
.
c: R
e
order fun
c
tio
n
s in p
r
eparation
fo
r
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
h: Make defau
l
t_notes_ref() avail
a
ble in
n
o
t
e
s API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
e
rla
n
d
(
t
rivial
)
notes
.
h: M
i
nor docum
e
ntation fixes to copy_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
note
s
.
c: Hexif
y
SHA1 i
n
die() messa
g
e f
r
om init_n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herlan
d
notes: Don't create (empty) commit when remov
i
ng no
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
r
l
a
nd
Enable cus
t
o
m
schemes fo
r
colum
n
colors in
the graph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herla
n
d
M
a
ke graph_n
e
xt_l
i
ne() available in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rl
a
nd
rev
i
si
o
n:
T
ur
n
off history simplifi
c
ation in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
r
evision:
F
ix t
y
po in --ances
t
ry-path err
o
r
message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
e
r
l
and
D
o
c
u
m
en
t
ation/rev-l
i
st-op
t
ions
.
txt: Expla
i
n
--a
n
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
Documenta
t
ion
/
rev-list-opti
o
ns
.
txt: Fix missing l
i
ne
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure "index $from
.
.
$to"
l
ine c
o
ntains un
a
mbiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
bu
i
l
tin-notes: Minor (most
l
y pa
r
se_op
t
ions-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
h
a
n Herland
submodule summ
a
ry: Don
'
t
b
arf
w
hen invoked in an e
m
pty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
builtin-notes:
A
dd "c
o
py"
s
ubcommand for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
uiltin-note
s
: Mis
c
.
refactoring
o
f
argc
an
d
e
xit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add -c/-C
o
ptions for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es
:
Refacto
r
handling of -
F
opt
i
on to a
l
low
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
e
rland
bu
i
ltin-not
e
s:
D
eprecate the
-
m/-F opti
o
n
s
for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add "
a
ppend"
s
u
b
c
ommand for
a
ppending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-notes:
Add "add" sub
c
o
m
mand
f
or
a
dd
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
built
i
n-notes: A
d
d --message/--f
i
l
e
aliases fo
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add "l
i
st" su
b
command for
l
i
sting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentation: Gene
r
alize git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
built
i
n-notes: Add
"
prune" s
u
bcommand
f
or removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Her
l
and
Notes API: prune
_
notes()
:
Pr
u
ne notes th
a
t belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erla
n
d
t3305: Verify that remo
v
ing
notes
t
riggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Add "remove" subco
m
mand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Tea
c
h
b
uiltin-notes to
r
emove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Te
a
c
h
notes
code to
p
r
operly preserve no
n
-no
t
e
s in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t33
0
5: Verify th
a
t adding ma
n
y notes
wit
h
gi
t
-not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301
:
Verify
s
u
ccessful an
n
otation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Builtin-ify gi
t
-
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Refactor notes co
n
catenation
i
nto a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes API:
A
ll
o
w mu
l
t
iple concurrent notes
t
rees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
Notes API: write_
n
otes_tree(): Store t
h
e n
o
t
es tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next