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
gitignore.txt: fix documentation of "**" patterns
2013-09-09
Johan Herland
t3200: Add te
s
t
demonstrating
minor regression in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Refer to branch
.
<name>
.
remote/merge when
documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
a
n
Herland
t
3200
:
Minor fix when
preparing for tracking
failu
r
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
H
e
rland
t2
0
2
4
: Fix &&-chaining
a
nd a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move create_
n
ot
e
s_commit()
f
rom
notes-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move copy_note_for_rew
r
ite + friends from builtin/n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an Herland
finish_copy_notes
_
for_re
w
rite()
:
Let caller
pr
o
vide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
glo
s
s
ary
:
Upda
t
e an
d
r
eph
r
ase the definit
i
on of
a
remot
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Val
i
date tracking branches with r
e
fspe
c
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t9
1
14
.
2: Don'
t
use --trac
k
option
a
g
a
ins
t
"sv
n
-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
t
7
201
.
24
:
Add r
e
fspec to keep --track wo
r
king
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3
2
00
.
3
9
: tracking setup shoul
d
fail if
t
here is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
c
h
eck
o
ut: U
s
e remote
r
e
f
s
p
ecs
w
hen DWI
M
m
ing tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
t2024: Show f
a
ilure t
o
use r
e
fspec
wh
e
n DWI
M
m
i
ng remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t2024: Add
t
ests ve
r
if
y
ing current DW
I
M behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herlan
d
git symbol
i
c-r
e
f
--delete $sy
m
ref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
a
n He
r
land
Fix
f
a
ilure t
o
d
el
e
t
e
a packed
ref through a s
y
mref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Herland
t
1
400-
u
pdate-ref: Ad
d
test verifying bug with
s
ymrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
erland
notes-merge: Do
n
't remove
.
g
i
t/NOTES
_
MERGE_WO
R
KTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an Her
l
a
nd
no
t
es-mer
g
e
: use ope
n
dir/
r
ea
d
dir i
n
stead of using re
a
d_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan He
r
l
a
nd
t
3
310: il
l
ustra
t
e fail
u
re to
"notes merge --commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
h
an Herl
a
nd
fast-import:
F
ix i
n
corr
e
ct fanout level when
modi
f
ying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2nd testcase
e
xposing bugs in f
a
st-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix
testcase co
v
ering up a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan
He
r
lan
d
t5400: Fix a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark di
r
stat erro
r
m
e
ssages for tra
n
slati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
oh
a
n Herland
I
m
pro
v
e e
r
ro
r
handling
when parsing dirstat p
a
r
a
m
eters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an He
r
lan
d
New --dirs
t
at=
l
ines mo
d
e,
doin
g
dirstat
a
na
l
ys
i
s base
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
A
l
low spe
c
ifying
-
-dirstat cut-off per
c
e
n
ta
g
e as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
d
d con
f
i
g
variable for specifyin
g
def
a
ult --d
i
rstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Ref
a
c
t
o
r
--dirstat parsing; deprecate --cumula
t
i
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han
H
erland
Make --dirstat=0 output dire
c
t
o
ries that c
o
ntribu
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Add several tes
t
cases for --dirstat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herla
n
d
--dirstat: In case
of
r
enames, use target
file
n
ame
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
H
erland
Teach --dirstat not to
c
ompl
e
tely ignore rearrang
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
irs
t
at-by-file: Make i
t
faster and
m
or
e
c
o
rrect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
--dirst
a
t
:
Describe no
n
-obvious differences
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herl
a
nd
M
ake
"git
notes
a
dd" more user-
f
riendly
w
hen there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Jo
h
an
H
erl
a
nd
log
/
pret
t
y-o
p
tion
s
: Document
--[no-]
n
otes and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
e
r
lan
d
branch/ch
e
ckout --track: Ensure that up
s
tream
b
r
anch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Jo
h
a
n
Herland
push
.
defa
u
lt: Rena
m
e
'
t
racking' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provid
e
'
git merg
e
--abo
r
t' a
s
a
synon
y
m to 'gi
t
reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_mer
g
e
(
): Parse options before checking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
r
o
v
ide 'gi
t
notes ge
t
-ref
'
to easily retrieve
current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
git
notes merg
e
: Add testcases for
merging notes t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes
merge
:
A
d
d another auto-r
e
solv
i
ng s
t
r
a
teg
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
g
i
t
notes merge:
--commit
should
f
a
il if
underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
n
d
gi
t
notes merge: List conflic
t
ing notes i
n
note
s
me
r
ge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
gi
t
notes merge: Manual conflic
t
resolut
i
on,
p
art 2/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes mer
g
e: Manual confli
c
t res
o
l
u
tion, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Documentati
o
n: Pr
e
l
iminary docs on 'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herlan
d
git notes merge
:
A
d
d automatic conflict r
e
sol
v
ers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
git notes merge: Handle re
a
l
,
non-confli
c
tin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rland
builtin/notes
.
c: R
e
fact
o
r creatio
n
o
f notes comm
i
ts
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
g
i
t notes merge: Initial implementa
t
ion handli
n
g trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
b
u
ilti
n
/notes
.
c
:
Split n
o
tes ref DWI
M
mery into a
s
e
parate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
e
s
.
c: U
s
e tw
o
ne
w
l
ines (
i
nstead of one) when
concate
n
atin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(
t
rivial) t3303: Inde
n
t
with tabs
i
nst
e
ad
of spac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
notes
.
h
/c:
Propagate combine_
n
otes
_
fn r
e
tu
r
n value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
n
o
t
e
s
.
h
/
c
: Allow combi
n
e_notes functi
o
ns to remov
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
ha
n
H
e
rland
not
e
s
.
c: Reorder functions in prepa
r
ation for n
e
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Her
l
and
note
s
.
h:
M
ak
e
default_no
t
es_ref() available in notes
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
e
rland
(trivial) n
o
tes
.
h: Minor doc
u
mentation fi
x
e
s
to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
e
rland
n
o
tes
.
c: Hexif
y
S
H
A1 in die() m
e
ssage from i
n
i
t
_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n
Herland
notes: Don't create (e
m
p
ty) commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Enable custo
m
sc
h
em
e
s for
c
olumn
co
l
ors
in the graph AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Herland
Ma
k
e graph_next_l
i
n
e
(
)
avai
l
able in t
h
e graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Turn off history simplification in --ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
revisi
o
n
:
Fix typo in --ancestry-path error me
s
s
age
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentatio
n
/rev-list-
o
ptions
.
txt
:
Expl
a
in --ance
s
tr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
r
land
Documentation/r
e
v-list-
o
ptions
.
txt: Fix mis
s
ing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
di
f
f
.
c
:
Ensure "ind
e
x
$
f
rom
.
.
$to" line
contains unamb
i
guou
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan H
e
rland
builtin-notes
:
M
inor (mostly pa
r
se_options-rela
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan
He
r
land
submodule summary
:
D
on't
b
arf when in
v
oked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es: Add "copy"
s
ubcom
m
and for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-no
t
es:
M
isc
.
refactoring o
f
argc and exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
builtin-n
o
tes: Add
-
c/-C
opti
o
ns for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
R
e
factor h
a
ndlin
g
o
f
-F option
to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
built
i
n-notes: Deprecate the -m/-F options for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
u
iltin-notes: Add
"
a
p
pend" subcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
builtin-notes: Add "add"
s
u
bcommand for addi
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Add
--messag
e
/--file al
i
ases
f
or -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add "list" subcommand
for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n Herl
a
nd
Do
c
um
e
n
tation:
G
e
neralize git-
n
otes
docs
t
o 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin
-
notes: Add
"
prune"
subcommand for re
m
o
v
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
N
otes
A
PI: pr
u
ne_notes(): Prune
n
ot
e
s that b
e
long
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305: Ve
r
i
f
y
that
r
emovin
g
notes triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "
r
emove
"
su
b
co
m
mand for removi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Teach bu
i
l
t
i
n
-notes to rem
o
ve empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
Te
a
ch notes code to properly preserve non-not
e
s in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
lan
d
t330
5
: Ve
r
if
y
that adding m
a
n
y
note
s
with
g
it-
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t3301: Veri
f
y
s
u
ccessf
u
l annotation of no
n
-commit
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Builtin-
i
fy
g
it-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
Refactor not
e
s conc
a
tenat
i
on i
n
to a f
l
exible interfac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: Allo
w
multiple co
n
curre
n
t n
o
tes trees
w
ith
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I: write_notes
_
tree(
)
: Store
t
he notes tre
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API: for_each_
n
o
te(): Traverse the entire n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
N
otes A
P
I: get_note()
:
R
eturn the
n
ote annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
and
N
o
tes API: remov
e
_
no
t
e(): Re
m
ove n
o
t
e
objects fro
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Notes API: add_note():
Add note objects to the
i
n
t
e
rnal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next