repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
sample pre-commit hook: use --bool when retrieving config var
2013-09-24
Jo
h
an Her
l
a
n
d
sam
p
le p
r
e-commit hook
:
use
-
-bool when retr
i
eving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t32
0
0
: A
d
d
test demonstrating m
i
nor
regression in 41c
2
1
f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Refer
t
o branch
.
<
name>
.
remote/merg
e
wh
e
n docume
n
ti
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200: M
i
nor
fi
x
whe
n
preparing for
t
racking failure
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Herland
t20
2
4: Fix
&
&-chaining and
a
c
o
uple of t
y
pos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
J
oh
a
n Herland
Mo
v
e create_no
t
es
_
c
o
mmit()
f
rom notes-merge
.
c into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
J
oh
a
n H
e
rland
Mov
e
c
opy_
n
o
te_for_rewrite + frie
n
ds from buil
t
i
n/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan He
r
la
n
d
finish_copy_notes_for_rewrite(): Let caller
p
rov
i
de
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
He
r
lan
d
glos
s
a
r
y: Update and
rephrase t
h
e de
f
inition of
a remot
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
e
r
land
branch
.
c
:
Validate tracking bra
n
ches
with
refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Her
l
and
t9114
.
2
: Don't use --t
r
ack op
t
io
n
against "
s
vn-remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t72
0
1
.
2
4: Add ref
s
p
e
c to kee
p
--track working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
Herla
n
d
t
3
200
.
39: tracking se
t
u
p
should fail if there is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
H
e
rla
n
d
checkout: U
s
e
r
emote re
f
spe
c
s when DW
I
M
ming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
t2024: Sho
w
failure to use refspec w
h
e
n
DWI
M
m
i
ng remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t2024: Add tests verifying cur
r
ent
D
WI
M
b
e
h
avior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herland
gi
t
symbolic-
r
ef --de
l
e
t
e
$symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix failu
r
e to
delete a
p
acked ref
th
r
ough
a
symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Her
l
a
n
d
t1400-u
p
date-ref: Add t
e
s
t
v
e
ri
f
yi
n
g bug with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
land
notes
-
merge: Don't remove
.
gi
t
/NOTES_MER
G
E_WO
R
KTR
E
E
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
not
e
s
-
merge: use
opendi
r
/readdir i
n
stead
of us
i
ng
read_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
r
l
and
t3310
:
il
l
ustrate
f
ai
l
ure to "n
o
tes
merge --c
o
mmit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
o
h
a
n Herla
n
d
fast-import: Fix incorrect
f
anout l
e
vel wh
e
n m
o
difying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
rl
a
nd
t9301: Add
2nd testcase ex
p
o
s
ing bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
l
a
nd
t
9301: Fix t
e
stcase
c
overin
g
u
p
a bu
g
in fast-
i
mport
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Herland
t5400:
F
i
x
a
c
ouple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Mark dirstat erro
r
messag
e
s fo
r
tran
s
lati
o
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han
H
e
rland
Im
p
rove error
h
andling wh
e
n
p
arsing dirstat parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New --
d
irstat=lines mode, doing
d
irstat analy
s
is based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Al
l
ow s
p
e
c
ifying --
d
irstat cut-
o
ff percen
t
age as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Her
l
and
Add confi
g
v
a
riabl
e
for s
p
e
c
ifying default --dirst
a
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ref
a
c
tor --d
i
rstat
p
ars
i
ng; depre
c
at
e
--cumulativ
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
M
a
ke --di
r
stat=0 ou
t
put
d
irecto
r
i
e
s that contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n
H
e
rla
n
d
Add sev
e
ral testcases fo
r
--dirstat and friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
J
oh
a
n He
r
land
--dirstat: I
n
cas
e
of rena
m
es, us
e
targe
t
filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
oh
a
n Her
l
a
nd
Teach --dirst
a
t not t
o
completely
ignore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-file
:
Mak
e
it faster and more correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dir
s
tat: Describe non-obv
i
ou
s
differences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herland
Ma
k
e
"
g
i
t
no
t
es ad
d
"
more user-
f
riendly
w
h
en there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Herland
log/pr
e
tt
y
-optio
n
s:
D
ocument
-
-[no-]notes an
d
deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan He
r
land
branch/checkout --track: Ensure that upstream
branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n Herla
n
d
push
.
def
a
ult: Rename 'tracking' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provi
d
e
'git merge --abort
'
as a synonym to 'git re
s
et
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
c
md_m
e
rge():
P
arse optio
n
s before checking ME
R
GE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git notes get-ref' to easily r
e
trie
v
e cur
r
e
n
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merg
e
:
Ad
d
testcases for me
r
gi
n
g not
e
s trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
git no
t
e
s
m
erge:
A
dd anot
h
e
r
auto-resolvi
n
g strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
git notes
m
erge: --commit shou
l
d
f
ail
if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge:
L
ist con
f
l
icting notes in no
t
es m
e
r
g
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git
n
otes m
e
rge: Manu
a
l
c
onfl
i
ct r
e
so
l
ution, part
2
/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git note
s
merge: Man
u
a
l
confli
c
t
res
o
l
u
t
i
on
,
part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
Docu
m
entation:
Pr
e
limina
r
y
docs on 'git notes me
r
ge
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git
notes merge: Ad
d
automatic confli
c
t
r
es
o
lver
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git
n
o
t
e
s me
r
ge: Handle real, non-co
n
flictin
g
n
o
t
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
built
i
n/notes
.
c: Refactor cre
a
tion of notes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
e
r
land
git notes merge
:
Initial implem
e
ntation handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
nd
builtin/notes
.
c:
Sp
l
it no
t
es
r
ef DWIMmer
y
into
a
s
eparate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c:
Use two
n
e
w
lines (
i
nstead of one
)
whe
n
c
o
n
cate
n
atin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3303:
I
nden
t
with tab
s
inste
a
d
of
space
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
otes
.
h/c: Propagate combine_notes_fn
return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow c
o
mbine_notes functi
o
n
s to
r
emove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
H
e
rland
notes
.
c: Reorder functions in preparation for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
h: Ma
k
e default
_
no
t
es_r
e
f() avai
l
able in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han He
r
land
(trivial) notes
.
h: Minor docum
e
ntation fixes
t
o
copy_not
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c: Hexify SHA1
i
n
die() message from init_note
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
n
o
tes: Don't cre
a
te (
e
mpty) commit
when removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n Herland
Enable cu
s
tom
schemes for colum
n
co
l
or
s
in
t
he graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_next_line() av
a
ilable in the g
r
aph
.
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
revision: Turn
o
ff history simplification in --anc
e
stry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
revision: Fix typo in --ances
t
r
y-path error
m
essage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documen
t
ati
o
n
/rev
-
list-options
.
txt: Explain --ances
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
oha
n
Herland
Docum
e
ntatio
n
/rev-list-options
.
txt: Fix
m
issing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
r
l
and
di
f
f
.
c
:
Ens
u
re "index $from
.
.
$to" line contains unamb
i
guous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan
Her
l
and
b
uilt
i
n
-
not
e
s
:
M
inor
(m
o
s
tly
p
arse_optio
n
s-relate
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Her
l
an
d
submodule summary: Don't b
a
rf when invoked
i
n
an em
p
t
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-no
t
es:
Add "copy" subcommand for copyi
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-
n
otes: Mis
c
.
refactoring of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
b
ui
l
tin-notes: Add -c/-C options for reusing not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
b
u
iltin-notes:
Refacto
r
handling of -F opt
i
on
to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
t
i
n-notes: Deprecate
the -
m
/-F options for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
bui
l
tin-no
t
e
s
:
Add "
a
ppend" subcom
m
and for appendi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builti
n
-
n
ot
e
s: A
d
d
"
add" subcom
m
an
d
f
o
r adding no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builtin-notes: Add --mes
s
age/--file ali
a
ses
for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "list"
s
ub
c
ommand for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
Document
a
tion: Generalize git-notes docs to 'objec
t
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
u
i
l
tin-notes: Add "prune" subcommand for
r
emoving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes
AP
I
:
prune_notes()
:
Prune notes that
belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
t3305: Verify that removing notes triggers automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Add "r
e
move"
subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
T
e
ach bu
i
ltin-not
e
s to r
e
move empty not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes
c
ode to properly preserv
e
non-no
t
es in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify t
h
a
t a
d
d
i
ng ma
n
y no
t
es with git-
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t3
3
01: Verify succ
e
s
s
ful
annotati
o
n
of no
n
-comm
i
ts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
Builtin-i
f
y git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refac
t
or notes
c
oncaten
a
tion into a flexible
interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: A
l
low multiple concurrent notes
t
r
ees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API:
w
rite_notes_tree(
)
: Stor
e
the no
t
e
s tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
e
s API
:
for_each_no
t
e
(
)
:
T
raverse the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes A
P
I:
get_n
o
te():
R
e
turn the
note anno
t
at
i
ng the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
Notes API:
remove_note():
Re
m
ove
n
ote objec
t
s
from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next