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
Git 1.8.3.2
2013-04-21
Johan
Herland
glossary: Update and reph
r
a
s
e the definition o
f
a r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Validate tracking branc
h
e
s
with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t9114
.
2:
D
on
'
t use --track opti
o
n
a
gainst "s
v
n-remo
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t
7
201
.
24:
A
dd refspec to kee
p
--trac
k
w
orking
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
Herland
t3200
.
39
:
tracking s
e
tup should fail
i
f
there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herla
n
d
checkout: Use rem
o
te r
e
fspe
c
s
when
DWIMming tracki
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024: Show failure to use refspec whe
n
DWIMming
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Her
l
a
nd
t2024: Add tests ver
i
fying current DWIM behavi
o
r of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
g
i
t symbolic-ref --del
e
te $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix
f
ailure to delete a packed
r
e
f
through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t14
0
0-upd
a
te-
r
ef: Add test verifying bug with symr
e
fs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n
Herlan
d
note
s
-merg
e
:
Don't remove
.
g
i
t/NOTES_MERGE_
W
O
R
KTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herland
notes-merge: use opend
i
r/r
e
a
ddir ins
t
ea
d
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 Herl
a
nd
t3310: illustrate fa
i
l
ure to "notes merge
--commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan Herland
fa
s
t-import: Fix incorrect fanout
l
evel w
h
en modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n
Herl
a
nd
t9301: Add 2nd test
c
a
s
e exposing bug
s
in
f
a
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t9
3
0
1: Fix test
c
a
s
e
covering up a bug
i
n fa
s
t-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Herland
t5400: Fix a couple of typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n
H
e
r
l
and
Mark dirstat
er
r
or me
s
sages
for
t
ranslation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Improve
e
rror handli
n
g
when
parsing dirst
a
t parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Ne
w
--dirst
a
t
=lines
mode,
d
oi
n
g dir
s
ta
t
analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
Al
l
ow sp
e
c
i
fying --dirstat cut-o
f
f percentage
as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Add config variable for sp
e
ci
f
ying def
a
ult --dir
s
tat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
R
e
factor
--dirstat parsing;
dep
r
ecat
e
--cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Make --dirstat=0 output directories
t
h
at contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
A
dd several testcases
f
o
r --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herla
n
d
--dirstat: In ca
s
e of rena
m
es, use targ
e
t filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dirstat not to com
p
letely ignore rearra
n
ged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
e
rla
n
d
--di
r
stat-by-f
i
le: Make it faster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rl
a
nd
--dirstat: Describe non-ob
v
i
o
u
s
di
f
ferences re
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n Herland
Make "gi
t
note
s
add" more us
e
r-friendly
w
hen there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n He
r
land
log/
p
ret
t
y-options: Do
c
ument --[no
-
]no
t
es
a
n
d depr
e
ca
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
Herland
b
r
a
nch/checkout --tr
a
ck:
E
n
sure that u
p
stream branc
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
de
f
ault: R
e
n
a
me 'tracking' to 'upstr
e
am'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Provide 'g
i
t mer
g
e --abort' as a synony
m
to 'git r
e
set
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
c
md_merge(): Parse op
t
ions be
f
ore
c
hecking
M
ERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provi
d
e
'gi
t
not
e
s get-ref' to easil
y
r
etrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes m
e
rge: Add testcases
for mergin
g
notes t
r
ee
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
t
e
s
m
erge: Add another a
u
to-
r
esolving
s
trategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
gi
t
notes merge: --commit should fail if
u
n
d
erlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merg
e
: List conflic
t
ing notes in notes mer
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merge
:
Man
u
al conflict
res
o
l
u
tion, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes merge: Manual conflict reso
l
ution, pa
r
t
1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
D
ocum
e
n
tati
o
n: Pr
e
liminary docs on
'git notes me
r
ge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
gi
t
notes m
e
rge: Add automatic
c
onflict resolv
e
rs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Her
l
and
git notes mer
g
e: Handle real
,
n
on-con
f
licti
n
g n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erl
a
nd
builti
n
/no
t
es
.
c:
R
efactor creat
i
on of not
e
s comm
i
ts
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes me
r
ge
:
Init
i
al
implementation handling t
r
ivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Her
l
and
builtin/note
s
.
c: Split notes
r
ef DW
I
Mme
r
y into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herla
n
d
notes
.
c
:
Use tw
o
n
e
w
lines
(ins
t
ead of
o
n
e
)
w
hen c
o
nca
t
enatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n
Herl
a
nd
(trivial) t3303: Indent with ta
b
s
i
nstead o
f
sp
a
ces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
n
otes
.
h
/
c
:
P
ropagate combine_no
t
es_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/
c
: Al
l
ow com
b
ine_not
e
s functions to
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
He
r
land
not
e
s
.
c:
Reo
r
der functions in pre
p
ar
a
tio
n
for nex
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
h: Make
d
efault
_
notes_ref() av
a
i
l
a
ble in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an Herla
n
d
(trivial
)
n
o
tes
.
h: Minor documentation f
i
xes
to c
o
py
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
c:
H
exify SH
A
1 in die() mess
a
ge
f
rom in
i
t
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herl
a
nd
notes: Don
'
t creat
e
(emp
t
y) commit w
h
en remo
v
ing
non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable
c
u
stom schem
e
s for column colors in the graph A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
ha
n
Herland
Ma
k
e graph_next_line
(
)
avail
a
b
l
e in the gr
a
ph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
revision: Turn off
h
i
s
tor
y
simplification in --an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
revision: Fi
x
typ
o
in --an
c
estry-path error
mess
a
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erlan
d
D
o
cumenta
t
ion/rev-li
s
t-o
p
tions
.
txt: Expla
i
n
--ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Document
a
tion/rev-l
i
s
t
-option
s
.
t
x
t: Fix missing li
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensure "index $from
.
.
$
to
"
lin
e
c
o
ntains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan Herlan
d
builtin-
n
otes: M
i
nor (mostl
y
parse_opti
o
n
s
-rel
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
su
b
module summary: Don't barf when invok
e
d i
n
an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
builtin-notes: Add "copy" subcomm
a
nd for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Her
l
an
d
builtin-notes: Misc
.
refactoring of argc
and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
:
Add -
c
/-C options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
builtin
-
notes: R
e
factor handling
o
f
-F option t
o
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
b
uiltin-notes: Deprecate t
h
e
-m/-F
options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bui
l
tin-note
s
: Add "append" sub
c
omman
d
for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
buil
t
in-notes:
A
d
d "add" s
u
bcom
m
and
f
or adding note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
bu
i
l
ti
n
-notes:
Add --message/--file aliases for
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
b
u
iltin-n
o
tes: Add "li
s
t" subcommand for l
i
sting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erl
a
nd
Doc
u
menta
t
ion: Ge
n
e
r
alize g
i
t-notes docs
t
o 'object
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Add "prune"
s
u
b
c
o
mmand for re
m
o
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
A
P
I: prune
_
notes(
)
: Pru
n
e
not
e
s
that
b
elong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herla
n
d
t3305:
V
erify
that removin
g
notes
trigge
r
s au
t
omatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
bu
i
lti
n
-notes
:
A
dd "remove
"
sub
c
ommand for removin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
Teach builtin-n
o
tes to r
e
m
o
ve empty n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Teach not
e
s cod
e
t
o p
r
operly preserve non-no
t
es in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305: Verify that
a
d
ding many notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
an
d
t3301: Veri
f
y successful
a
nnotation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
an
d
Builtin-if
y
git-no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
R
efactor notes c
o
ncatenat
i
on
into a flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Note
s
API:
A
llo
w
mul
t
iple c
o
n
c
urrent
n
otes t
r
ees
wit
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
N
ot
e
s API: wr
i
te_notes_tree(): Sto
r
e the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: fo
r
_each
_
note(): Tr
a
ver
s
e
the
ent
i
r
e
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes
A
PI:
ge
t
_n
o
t
e
(): Return the note annotating
t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: remove_not
e
(): Remove note o
b
jec
t
s
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Notes A
P
I: add_no
t
e(): Add note o
b
jects
to the inter
n
al
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API: init_not
e
s(): Initialize the
note
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
A
dd tests
f
or check
i
ng corre
c
t han
d
lin
g
o
f $GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
N
o
tes API: get_commit_notes() -> format_note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmetic fi
x
e
s
to no
t
es
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
J
oha
n
Herland
b
uil
t
i
n
-config: Fix crash wh
e
n
us
i
n
g
"-f <relati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Ad
d
more t
e
stcases
t
o
test
f
ast-import
of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
Herlan
d
Re
n
a
m
e t9301 to t93
5
0, to make r
o
om for
m
ore fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next