repo.or.cz
/
git.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.4.2
2013-09-09
Joh
a
n Her
l
and
t3200:
A
d
d test
demonstrating minor reg
r
ession in
4
1
c21
f
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
Herland
Refe
r
to branch
.
<nam
e
>
.
remote/merge
w
hen documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
Herland
t3200: Minor fix when preparing for tr
a
cki
n
g f
a
il
u
re
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
land
t2024:
F
ix &&-chaining and a
c
o
u
p
l
e of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
ohan H
e
rla
n
d
Mo
v
e creat
e
_
notes_commit()
from no
t
es-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herland
Move copy_n
o
te_for_rewrite + friends from builtin/
n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
H
er
l
and
f
i
nish_c
o
py
_
notes
_
f
o
r_rewrit
e
():
L
et caller provid
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
g
l
ossary: Update a
n
d rephra
s
e
t
he d
e
finition of
a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herla
n
d
br
a
nch
.
c: Valid
a
te tracking bra
n
che
s
with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
oh
a
n Herla
n
d
t9114
.
2
: Don't use --
t
r
a
ck option agai
n
st "sv
n
-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t7201
.
24: Add refspec to
k
eep
-
-tr
a
ck wor
k
i
ng
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
t3200
.
39: t
r
a
c
king setup should fail if there
is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
ch
e
cko
u
t: U
s
e re
m
ote refspecs when DWIMming tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2024
:
S
h
ow fai
l
ur
e
to
use
r
efspec when DWIMming
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t2024: Add tests verifyin
g
c
u
r
re
n
t
DWIM behavior
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
git symbolic-ref --del
e
te $sy
m
r
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix failu
r
e to delete a packed ref
t
h
rough
a
s
y
mre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
oh
a
n
Herlan
d
t1400-update-ref: Add test veri
f
ying b
u
g
wit
h
symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herl
a
nd
notes-merge: Do
n
't remov
e
.
g
i
t/NOTES_MERGE_WORK
T
RE
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-m
e
rge:
u
se opendir/read
d
ir instead of using read_direc
.
.
.
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 failur
e
to "notes
m
e
rge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
f
a
st-i
m
po
r
t: Fix incorr
e
ct fan
o
ut
l
evel when modifyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
t9301: Add
2
n
d test
c
ase exposing bugs
in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: F
i
x testcase coverin
g
up
a
bug in fast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
He
r
land
t5400: Fix a
couple of
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Mark d
i
rs
t
at error
message
s
for
t
r
anslati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve
e
rro
r
handling when parsing dirst
a
t
p
aramete
r
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New -
-
dirs
t
at=lines
m
ode, doi
n
g dirs
t
at
analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specifyi
n
g --dirstat cu
t
-off
p
ercentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Add
config variable for s
p
e
c
ifying
default --dirs
t
at
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Refactor
-
-dir
s
t
a
t p
a
rsing;
d
eprecate --cumulati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
n
d
Make --dirstat=0 output direct
o
ries that
c
ontribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Add several testcases fo
r
-
-dirstat and f
r
i
e
n
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han Herland
--d
i
rstat: In case of re
n
ames,
use target filen
a
me
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herla
n
d
T
each --dirstat
n
o
t
t
o co
m
p
l
e
tely ignore
rearra
n
ged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
r
l
and
--dirstat-by-file: Make it faster and more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--
d
ir
s
t
at: Describe non
-
obviou
s
differen
c
es
r
e
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han Herland
Make "git no
t
es add"
m
o
r
e
u
se
r
-f
r
iendly
w
hen ther
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan He
r
land
log/p
r
e
t
ty-options: Document --[no-]notes
and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branc
h
/checko
u
t --track: Ensure that upstrea
m
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herlan
d
push
.
d
e
fault:
Rename 'track
i
ng' to
'
u
p
stream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
P
rovide 'git mer
g
e
--abort' a
s
a
synonym to 'git
r
eset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
rla
n
d
cmd_merge(): Parse
o
p
t
ions before checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
P
r
o
vide
'
g
it notes get-ref' t
o
easily retri
e
ve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s merge: Add
t
est
c
ases for
merging no
t
es trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
git notes m
e
rge: Ad
d
a
nother auto-resolv
i
ng strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes me
r
ge: --commit should
fa
i
l if underl
y
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
me
r
g
e:
L
ist confli
c
ting notes
in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n He
r
land
g
it
no
t
es
m
erge: M
a
nual conflict r
e
s
o
luti
o
n, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
a
n
d
git
n
otes
merge: Manual c
o
nflict resolu
t
ion, p
a
rt
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
Documen
t
ation:
P
reliminary docs
o
n 'git notes m
e
rge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
git notes me
r
ge:
Add auto
m
ati
c
confl
i
c
t
resol
v
ers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
git notes me
r
ge: Handle re
a
l
, non-conflicting n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
builtin/notes
.
c:
R
efa
c
tor creation
o
f notes
c
om
m
i
ts
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes m
e
rge: Initial
impl
e
mentation handlin
g
t
rivi
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
builtin/notes
.
c: Split no
t
es ref DWIMm
e
ry into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
notes
.
c: Use two newlines (i
n
stead of
o
n
e
)
when c
o
ncatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
(trivial)
t3303: Indent with t
a
bs
i
nstea
d
of
s
paces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
notes
.
h/c: Propa
g
ate combin
e
_notes_fn
return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
Herla
n
d
not
e
s
.
h
/c
:
Allow combine_notes functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
r
land
note
s
.
c: Reorder
fu
n
cti
o
n
s
in preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
note
s
.
h: Make default_notes_r
e
f
(
) available
i
n
notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
er
l
a
nd
(trivial) notes
.
h: Minor documentati
o
n fixes to copy_
n
otes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan H
e
rla
n
d
notes
.
c
: Hexify SHA1 in
d
ie()
m
essa
g
e from
init
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herla
n
d
notes: Don't create
(empt
y
) commit when r
e
moving
n
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herland
E
n
a
ble custom schemes for column
c
olors in
the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
He
r
l
a
nd
Make
graph_next_line() ava
i
lable in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan H
e
rland
r
e
v
ision: Turn off hi
s
tory
simplification
i
n --a
n
cestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Her
l
and
r
e
vi
s
ion:
F
ix
typo in --a
n
cestr
y
-
p
a
t
h error
mess
a
ge
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
Doc
u
mentation/rev-list
-
opt
i
ons
.
txt: E
x
p
lain --ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
oc
u
mentation/rev-list-options
.
t
x
t: Fix
mi
s
s
i
ng
line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan
Herland
d
iff
.
c
:
En
s
ure "ind
e
x $from
.
.
$
to" line contains unamb
i
guous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
bui
l
tin-notes:
M
in
o
r (mostly p
a
rse_
o
p
tions-relat
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
Herland
su
b
module summary: Don't barf when invoked in
a
n empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herland
builtin-notes: Add
"
copy" s
u
bc
o
m
m
and
f
o
r co
p
ying no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
b
u
iltin-
n
ot
e
s: Misc
.
ref
a
ct
o
ring
o
f a
r
gc and ex
i
t value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes: Add -c/-C
o
ptions for reusing not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-notes: Refactor handl
i
n
g
of -F option to
allo
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Deprec
a
te the -m/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herla
n
d
builtin-notes: Add "append" subc
o
mmand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-not
e
s: Add "add" subcommand for addi
n
g no
t
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
builtin-notes: A
d
d
--mess
a
g
e
/--fil
e
alia
s
es f
o
r -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
Herland
builtin-notes:
Ad
d
"list"
subcomman
d
for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Docume
n
t
a
t
i
on:
G
eneralize git-notes d
o
c
s
t
o
'
objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Add "prune" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API: prune_n
o
tes(): P
r
une
n
otes that belo
n
g
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
t3305: Ve
r
ify that removing notes t
r
iggers au
t
omatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Ad
d
"remo
v
e" subcommand
f
o
r re
m
oving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Te
a
ch
builtin-notes to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
Teach notes code to prop
e
rly
p
rese
r
ve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305:
Ver
i
fy that ad
d
ing many notes with git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3301: Verif
y
suc
c
essful ann
o
tation of
n
on-co
m
mits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Buil
t
in-ify
g
it-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
nd
Refac
t
or notes c
o
ncatenation into a flexible interf
a
ce
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Note
s
API: Allow multiple c
o
ncurrent
notes tr
e
e
s
wi
t
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
Notes API: w
r
i
te_no
t
e
s
_tree(): Store the notes
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API: for_each_note(): Tr
a
v
erse th
e
ent
i
r
e
n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
g
et_note(): Return the note annotati
n
g the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes
A
PI: remove_not
e
(): Remove note objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
Notes API: add
_
no
t
e
(
): Add note objects to the
internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next