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
branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
2013-04-21
J
o
han He
r
land
branc
h
.
c: Validate tracking bra
n
ch
e
s with ref
s
pecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
h
a
n Herland
t9114
.
2
: Don't u
s
e -
-
track
option
against "svn
-
remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
r
land
t
7201
.
24: Add refsp
e
c
t
o
keep --track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t320
0
.
39
:
t
r
a
cking se
t
up
s
hould fai
l
if there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
Herlan
d
checkout: Use re
m
o
te refspecs
w
hen DWIMming tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herlan
d
t
2
0
24:
Show fai
l
ure to
use refspec
w
he
n
DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Add tests verifying c
u
rr
e
nt D
W
IM
b
ehavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
l
a
n
d
git symboli
c
-ref
--delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix fail
u
re to delete a
packed ref
through a symr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herlan
d
t1400-updat
e
-r
e
f: Add test verifying bug with s
y
mrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: Don't remove
.
git/NOTES_MERGE_WORKTR
E
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
notes-merg
e
: use open
d
ir/
r
e
addir instead o
f
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 Herland
t
3310: illustrate failur
e
to "notes me
r
ge --
c
o
mm
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan
H
erland
fast-import
:
Fix incorrect fa
n
o
ut l
e
vel when
m
odifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t930
1
:
A
dd 2nd testcase ex
p
o
s
ing b
u
gs in fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t9301
:
Fix testcas
e
cove
r
ing up
a
bug i
n
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
Herla
n
d
t
5400: Fix a co
u
ple o
f
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n
Herland
Mark
d
i
rstat error
messages f
o
r translat
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Improve error
handling
w
hen pars
i
n
g
di
r
sta
t
parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
r
land
New --dirstat=l
i
nes m
o
de, doing dirstat ana
l
ysi
s
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
l
low specifying
-
-dirstat
c
ut-o
f
f
p
erce
n
t
a
ge as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config
v
ariabl
e
f
or specifying default --dir
s
ta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
R
efa
c
tor --dirstat
parsing; d
e
p
recate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Make --dirstat=0 output directories that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
r
la
n
d
Ad
d
se
v
eral testcase
s
for --di
r
stat an
d
fr
i
e
n
ds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--d
i
rstat:
In case of renames, use targe
t
filena
m
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
oh
a
n Herland
Teac
h
--
d
ir
s
tat
n
o
t to
completely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirsta
t
-by-file: Make it fas
t
er an
d
m
o
re correc
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Descr
i
b
e
n
on-obvious diff
e
re
n
ces relati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make
"g
i
t not
e
s add"
m
ore user
-
f
r
iend
l
y whe
n
t
here
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an Herl
a
nd
l
o
g/
p
retty-options: Document --[no
-
]
n
otes
a
nd depreca
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
Herland
b
r
a
n
ch/check
o
ut --t
r
ack: Ensu
r
e
that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
p
ush
.
defau
l
t
: Rename 'tr
a
cking
'
to 'u
p
st
r
eam'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git me
r
ge --
a
bort' as a
synon
y
m to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd
_
merge(): Parse options
bef
o
re checking MERGE_HE
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
Provide 'git n
o
t
e
s ge
t
-ref
'
to eas
i
ly retrieve curre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git
notes m
e
rge: Add test
c
ases for mer
g
ing notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
g
it
n
otes merge:
A
dd another
a
uto-reso
l
vi
n
g strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
not
e
s m
e
rge: --commit s
h
ould fail if u
n
derlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git note
s
me
r
ge: List conf
l
icting not
e
s
in
notes
m
erge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herla
n
d
git notes me
r
ge: Man
u
a
l
confl
i
ct
r
e
s
ol
u
t
i
on, p
a
rt 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herl
a
nd
git notes merge: Manual conflict resolution, par
t
1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation:
P
re
l
iminary doc
s
on 'git n
o
tes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
g
i
t notes merge: Ad
d
automati
c
conflic
t
resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
He
r
l
a
nd
git notes merge: Hand
l
e
r
e
a
l, non-con
f
l
i
c
t
ing
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
builtin/notes
.
c:
Refactor cr
e
ation
of notes
c
o
m
mits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Her
l
and
git notes
merge: Initial
i
mpleme
n
tati
o
n ha
n
dling
t
rivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Her
l
and
builti
n
/
n
otes
.
c: Split n
o
tes ref DWIMmer
y
into a separ
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
note
s
.
c:
Use two newlines (instead of one) wh
e
n concatenat
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
(trivial)
t
3
3
03: Indent w
i
th tabs instead
o
f
s
p
a
ce
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herlan
d
notes
.
h
/c: Pro
p
ag
a
t
e combine_notes_fn
ret
u
r
n
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
h/
c
: Allow combine_notes functions
t
o re
m
o
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
ote
s
.
c: Reo
r
de
r
f
unctions in preparation for
ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
no
t
es
.
h: M
a
ke d
e
f
a
ult_notes_ref()
available i
n
notes
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes
.
h
: Minor documentation
fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
an
d
n
otes
.
c: Hexify SHA1 in die()
m
essage from
in
i
t_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n Her
l
and
notes: Don't create (empt
y
) commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n Herland
Enable custom schemes f
o
r
c
olumn colors in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_nex
t
_line() available in
the g
r
a
ph
.
h AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision:
T
urn off h
i
sto
r
y simplific
a
tion in --a
n
cest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
evision: Fix
t
ypo
in --ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
land
Documentati
o
n/rev-list-opt
i
o
ns
.
t
xt:
E
x
p
lain --anc
e
stry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
D
ocu
m
entatio
n
/rev
-
list-o
p
tions
.
txt: Fix missing l
i
ne
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
ha
n
H
erland
diff
.
c: Ensure "index $from
.
.
$
t
o" li
n
e con
t
ains unam
b
iguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Her
l
and
builtin-notes:
Minor
(mostly parse_options
-
r
e
lated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
sub
m
odule summary: Don't barf when invoked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
built
i
n-notes: Add "copy" subcommand for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes:
M
isc
.
re
f
actoring o
f
argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Herland
builtin-notes: Add -c/
-
C opti
o
ns
for reus
i
ng notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herland
bu
i
ltin-notes: Refactor handl
i
ng
o
f -
F
o
pti
o
n to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Deprecate the -m/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
b
u
i
lt
i
n-notes: Add "append
"
subcommand for append
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
buil
t
in-no
t
es: Add
"
add" subc
o
mma
n
d f
o
r a
d
di
n
g
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
builtin-notes
:
Add --message/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add "list" subcommand for list
i
ng note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Documentation: Gener
a
lize git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes: Add "prune" subcommand
for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
N
otes API: prune_notes(): Prune notes tha
t
belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305: Veri
f
y tha
t
r
emoving notes trigge
r
s
a
utomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes: A
d
d "rem
o
ve"
s
u
b
command for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
Teach built
i
n
-
n
o
t
es to remove e
m
pty
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herl
a
n
d
Teach notes code to p
r
o
p
e
rly preserve non-n
o
tes i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Veri
f
y that add
i
ng many
n
otes wit
h
git-
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301:
V
e
rify successful anno
t
ation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erl
a
n
d
Builtin-ify git
-
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor notes concat
e
nati
o
n
i
nto a flexible
interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
N
o
tes AP
I
:
Allow multiple concu
r
rent notes trees wi
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes API: w
r
ite_n
o
tes_tree(): St
o
re the notes
t
re
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es
A
PI: for_eac
h
_n
o
te(): Traverse the entire n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: get_note(): Return the note anno
t
ating
the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
Notes API: remove_n
o
t
e
(): Remov
e
note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I: add_not
e
(
): A
d
d
note
obje
c
ts to the intern
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Notes A
P
I:
i
ni
t
_no
t
es(): Initia
l
ize the
n
o
tes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
A
dd tests fo
r
checking correct h
a
n
dling of $
G
IT
_
NOTES_
R
EF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
No
t
es API: get_commit_notes(
)
-> format_note()
+ remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor c
o
smet
i
c fixes to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
buil
t
in
-
config: Fix crash when us
i
ng "-f <
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
Ad
d
more testcases to test fast
-
i
m
po
r
t
of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
h
a
n He
r
land
Rename t9301 to
t9350, to make r
o
om for
m
ore fast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herlan
d
fa
s
t-imp
o
rt: Proper
n
otes t
r
ee m
a
nipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next