repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'nd/clone-local-with-colon'
2013-09-24
Johan Herland
sa
m
ple
pre-commit hook: use --b
o
ol when retr
i
eving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t32
0
0:
Add test demonstrating minor regres
s
ion
i
n 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
er
l
and
Re
f
e
r
to branch
.
<n
a
me>
.
remote/merg
e
when documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200: Mi
n
or f
i
x w
h
en preparing f
o
r t
r
acki
n
g
f
ailure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
e
r
lan
d
t
2
024: Fix &&-chaining and
a
couple of typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an H
e
rland
Move create_notes_commit() from note
s
-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move
c
opy_note_fo
r
_rewrit
e
+ f
r
i
e
nds from built
i
n/no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_
c
opy_n
o
tes_for_rewr
i
te(): Let caller pr
o
v
i
de
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
er
l
and
glossary: U
p
date and rep
h
rase the de
f
inition
o
f a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
bran
c
h
.
c:
V
alid
a
te t
r
acking b
r
a
n
ches with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t9114
.
2: Don't use --track option again
s
t "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
7201
.
24: Add refsp
e
c to keep --track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t3200
.
3
9
: tracking setu
p
s
h
ould fail if t
h
ere is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erlan
d
c
h
eckout: Use remote refsp
e
cs when
DWIMming t
r
acking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
t2024: Sho
w
fail
u
re to us
e
refspec when DWIMm
i
n
g
re
m
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
t2024: Add
t
ests verifying current DWI
M
behavior
o
f
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan
Herland
git
symbolic-ref --delete $sy
m
ref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan H
e
rland
Fix fai
l
u
re
t
o
d
e
le
t
e a packed r
e
f thro
u
gh a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Her
l
and
t1400-upda
t
e-ref: Add
test verifying bug
w
i
th symre
f
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
er
l
and
notes-me
r
g
e
:
D
on't remove
.
git/NOTES_
M
E
R
G
E_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
a
n
Herland
not
e
s
-
merge:
u
se opendir
/
r
e
addir inste
a
d of usin
g
read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t3310: i
l
lustrate failure to "notes merge --co
m
m
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
h
a
n H
e
r
la
n
d
fast-i
m
por
t
: Fix
i
ncorrect fanout level wh
e
n
m
odi
f
ying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erland
t9301: Add 2nd t
e
stcase exp
o
sing bugs i
n
f
a
st-im
p
or
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t9301: Fix testcase covering up a b
u
g in
f
ast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400
:
F
i
x a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Her
l
and
Mar
k
dirst
a
t
e
rror m
e
s
sages
for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Impro
v
e error handli
n
g when pa
r
sing
d
i
r
s
t
a
t parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
N
ew
--dirstat=l
i
nes mode
,
do
i
ng d
i
rstat an
a
lysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an H
e
rland
Allow specifying --dirs
t
a
t
cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
A
d
d co
n
f
i
g
vari
a
ble f
o
r spe
c
ifying default --dirs
t
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Refa
c
tor
-
-dirs
t
at pars
i
ng
;
depre
c
ate --c
u
mulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herla
n
d
Make --dirstat=0 outpu
t
d
irectories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add s
e
veral testca
s
es for --dirsta
t
a
n
d
friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan
Herland
--d
i
rstat: In case of renames, use
targ
e
t f
i
l
e
name
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herla
n
d
Teach
--dirstat not to
com
p
letely ig
n
ore rearra
n
ged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
--dirstat-by-file
:
Make it fas
t
er and more c
o
rrect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rland
--dirs
t
a
t: De
s
cribe non-obvious difference
s
r
elati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Her
l
and
Make "git notes add" more user-friendly when the
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
ha
n
Herl
a
nd
log/p
r
ett
y
-
o
ptions
:
Document -
-
[
n
o-]notes and
d
eprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/checkou
t
--track: Ensu
r
e that ups
t
ream b
r
anch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herla
n
d
pus
h
.
default: Rename
'
t
r
a
cking'
t
o 'u
p
stream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
Provi
d
e 'git merge --a
b
o
rt'
a
s a
synonym to
'
g
it reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge(): P
a
rse
o
ptions be
f
ore checki
n
g MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide
'
git notes get-ref' to easily ret
r
ieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
g
it notes
m
erge
:
A
d
d testcases fo
r
merging
n
o
t
es trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git
n
otes merge:
Add another auto-re
s
olving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes m
e
rge
:
--commit should fail if u
n
derlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List conflicting notes
i
n
n
ote
s
me
r
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
g
it no
t
es
merge: Man
u
al
con
f
lict reso
l
ution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herland
g
i
t notes mer
g
e: Manual conflict resolution,
p
a
r
t
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rland
D
o
c
umentation: Pr
e
liminary docs on 'gi
t
notes
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
i
t notes
m
erge: Add automatic confli
c
t resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git
n
o
t
es
me
r
ge:
H
a
nd
l
e real, non-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
builtin/notes
.
c: Re
f
actor creation of notes
co
m
mits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
git notes merge: Ini
t
ial i
m
plemen
t
a
t
ion handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
builtin/notes
.
c: Split no
t
e
s ref DWIMmery into
a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
notes
.
c
:
U
se
two newlines (ins
t
ead of one
)
when concatenati
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
(trivial) t3303:
Ind
e
nt with
t
abs instea
d
of s
p
aces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
l
and
notes
.
h
/
c: Propa
g
a
te
combine_notes
_
f
n
re
t
urn val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
es
.
h/c: Allow combi
n
e_
n
otes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
e
rland
note
s
.
c:
R
eo
r
d
e
r fu
n
c
tio
n
s in prep
a
rat
i
on for
next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
h
: Make
defau
l
t_
n
otes_r
e
f() availabl
e
i
n
n
otes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h:
M
inor
documentation fixes to copy_note
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
c: Hexify SHA1
i
n die() m
e
ssage fr
o
m init
_
notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes
:
Don't create (empty) c
o
mmit
w
hen rem
o
vin
g
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herla
n
d
Enable
c
u
stom schemes for column color
s
in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
H
e
rland
M
ake graph_n
e
xt_line() available in
the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revision: Turn off history si
m
plificati
o
n in
--
a
nce
s
t
ry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revisio
n
: Fix typo in --
a
nce
s
try
-
pa
t
h error mes
s
ag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docu
m
enta
t
ion/r
e
v-list-options
.
txt:
E
xplain --an
c
e
st
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
D
o
c
umen
t
a
tion/rev-list-o
p
tions
.
txt: Fix missi
n
g
l
ine
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herl
a
nd
diff
.
c:
E
nsure
"
i
ndex $
f
rom
.
.
$to
"
line con
t
ai
n
s unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
bui
l
t
i
n-note
s
:
Mino
r
(
m
o
stly p
a
rse_option
s
-
r
ela
t
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
subm
o
dule summary: Don't ba
r
f
whe
n
invoked in
a
n empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builti
n
-notes: Add "copy" subcommand for copy
i
ng notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes
:
Misc
.
refactoring of argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes
:
Add
-c/-C options
f
or reusing
no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
b
u
il
t
in-not
e
s: Refa
c
t
o
r ha
n
dling
o
f -F option to
a
llo
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
builtin-notes: Deprecate
the -m/-F options for
"
git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-notes: A
d
d
"append" subcommand for ap
p
ending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
builti
n
-notes
:
Add
"
add" sub
c
ommand for
a
ddin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
r
l
and
builtin-
n
ot
e
s:
Add
-
-message
/
-
-file al
i
a
ses for
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add "list" subc
o
m
mand for li
s
ting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Documentation: Generalize git-notes docs to 'objec
t
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin
-
notes: Add "prune" subcomman
d
for r
e
m
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Note
s
API
:
prune_notes
(
):
P
r
une no
t
es that be
l
ong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
05: Verify that remov
i
n
g notes trigger
s
a
u
t
o
mat
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
bui
l
tin-n
o
tes
:
Add "rem
o
v
e" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
builtin-not
e
s t
o
r
e
move empty
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Teach not
e
s code to
proper
l
y prese
r
ve non-n
o
tes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
t
3305:
Verif
y
tha
t
ad
d
in
g
many notes wi
t
h git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t330
1
: Verify
s
uccessful annot
a
t
ion o
f
non-commi
t
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Built
i
n-ify git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Refacto
r
notes co
n
catenation int
o
a
flexible i
n
terf
a
ce
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erl
a
n
d
Notes API: Al
l
ow multip
l
e c
o
ncu
r
ren
t
notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
Notes API: wr
i
te_notes_tree
(
): Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Notes API
:
for_
e
ach_
n
o
t
e(): Traverse
the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes
API: get_
n
o
te(): Return t
h
e not
e
an
n
otating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes AP
I
: remove
_
no
t
e(): R
e
move note o
b
jec
t
s from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next