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
t3200: Add test demonstrating minor regression in 41c21f2
2013-09-09
Johan Herland
t3200: Add test demonstrati
n
g min
o
r regre
s
sion i
n
41c21
f
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
l
and
Refer
to branch
.
<
n
a
m
e>
.
rem
o
t
e
/merge when docum
e
n
ting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Her
l
and
t3200: Minor
f
i
x when prepa
r
i
ng for trac
k
ing failu
r
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan
H
e
r
la
n
d
t
20
2
4: Fix &&
-
chainin
g
a
n
d
a
c
ouple o
f
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
glo
s
sary:
Upd
a
te
and
r
eph
r
ase the definition of a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
b
r
a
nch
.
c: Validate
t
racking
branch
e
s
w
ith refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
a
nd
t9114
.
2:
Don't us
e
--track option
against
"svn-remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t7
2
01
.
24: Add re
f
spec to ke
e
p --track workin
g
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t3200
.
39: tr
a
cking setup should fail if the
r
e
is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
a
n
d
c
heckout: Use re
m
o
t
e refspec
s
when D
W
IMmin
g
t
r
acking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
H
e
rland
t2024: S
h
o
w failure t
o
use
refspec
w
hen DWIMming r
e
mote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
lan
d
t202
4
: Add tests verifying current
DWIM
b
e
havior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
Herl
a
nd
git symbolic-re
f
--
d
e
l
e
te $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
Fix failur
e
to delete a packe
d
r
e
f through
a
s
y
mref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herland
t1
4
00-updat
e
-ref
:
Add test verif
y
ing bug w
i
th symre
f
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herlan
d
n
o
te
s
-
merge: Don't r
e
mov
e
.
g
it/NOTES_
M
ERGE_WORKTR
E
E
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
not
e
s-merge:
use opendir/readd
i
r inst
e
ad 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
Jo
h
an Herland
t3310: illus
t
rate failure to
"
no
t
es merge --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
fast-import: Fi
x
incorrect fanout level whe
n
mod
i
fy
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
t9301
:
Add 2n
d
test
c
ase
e
xposing bug
s
in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
t9301: Fix
testcase covering up a
bug in fast-impor
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a coupl
e
of typ
o
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dirstat er
r
or messages for translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
nd
Improve err
o
r ha
n
d
l
i
n
g
when pa
r
sin
g
dirstat par
a
me
t
ers
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
New --dirstat=lines mode, doing dirstat analys
i
s based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Al
l
ow specify
i
ng --d
i
r
s
tat cut-off per
c
entage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rland
Add config variable for
specifying de
f
aul
t
--dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herl
a
nd
R
efactor --dirstat parsi
n
g
;
deprecate
-
-cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Make --dirstat=0 output direc
t
ories that contribut
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Add se
v
eral te
s
tcas
e
s for --dirstat and frien
d
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
an He
r
l
and
--d
i
r
stat
:
In ca
s
e of renames,
u
s
e
target
fi
l
ename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
T
each
--dirstat not
t
o completely ignore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--dirs
t
at-by-fi
l
e: Make it faster and
m
ore co
r
rect
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
e
rland
--dirstat
:
Describe non-obvio
u
s dif
f
er
e
nces rel
a
tive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git notes
add" more user-fr
i
endly wh
e
n
there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herl
a
nd
l
o
g/pre
t
ty-o
p
ti
o
n
s: Document
--[no-]notes and deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branc
h
/
checkout --track:
E
nsure that u
p
st
r
ea
m
branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Joha
n
H
e
rl
a
nd
push
.
default: Rena
m
e
'
t
racking' to 'upstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge --abort' a
s
a synony
m
t
o '
g
it re
s
et
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
cmd_mer
g
e():
Parse options before
c
he
c
k
i
ng MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Provide 'git notes get
-
ref' to ea
s
ily retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes mer
g
e: A
d
d testcases
f
or
merg
i
ng notes
trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
git notes
merge
:
A
dd another auto
-
r
e
solving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
nd
git notes
m
e
rge: --commit shou
l
d fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
r
land
git notes mer
g
e: List con
f
lictin
g
notes
in notes me
r
g
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Man
u
a
l
c
o
nflict resolution, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it n
o
tes merge: Manual
conflic
t
reso
l
uti
o
n,
part 1
/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Docu
m
entation
:
Preliminary docs on 'git no
t
e
s
m
erge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git note
s
merge: Add automatic conflict
r
e
sol
v
ers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
r
land
git notes merge: H
a
ndle real,
n
on-c
o
n
f
l
icting
n
ote
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
builtin/notes
.
c: Refa
c
t
o
r cr
e
a
tion of notes
commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
g
i
t notes merge: I
n
itial impl
e
mentation handling t
r
ivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
builti
n
/no
t
e
s
.
c: Spl
i
t notes re
f
DWIMmery into a
s
eparate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
c: Use tw
o
newlines (instead of one) when con
c
a
t
enat
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
rland
(trivial
)
t3303: Indent
wi
t
h tabs
ins
t
ead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rland
n
o
tes
.
h/c: Propaga
t
e combin
e
_notes_
f
n
return
val
u
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
n
ote
s
.
h/c: Allow combine_notes functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
ote
s
.
c: Re
o
rder functions
i
n prep
a
r
ation
f
or next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n Herland
notes
.
h: Make
d
e
fault_notes_ref() available in
n
ote
s
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(
t
rivial) note
s
.
h
: Minor docume
n
tation fixes to co
p
y_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
e
r
land
no
t
es
.
c: Hexify SHA1 in die()
message from in
i
t
_
no
t
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
an He
r
land
notes: Don't create (e
m
pty) commit when removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
r
l
a
nd
Enable cust
o
m sc
h
emes
f
or column co
l
ors in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rla
n
d
Make g
r
aph_next_l
i
ne() avai
l
able in th
e
grap
h
.
h
A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
re
v
ision: Turn off h
i
story simplificatio
n
in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n
Herlan
d
revision: Fix typo in --ancestry
-
p
a
th erro
r
messag
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
D
ocum
e
ntatio
n
/
r
ev-l
i
s
t
-options
.
txt:
E
xplain --
a
ncestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
Doc
u
mentation/rev-list-options
.
txt: Fix mis
s
i
ng l
i
ne
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan
H
erland
dif
f
.
c: Ensure "index $from
.
.
$to" line
c
ontains unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-not
e
s: Minor
(
mostl
y
parse_options-
r
elated
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
ohan Herland
s
u
bmo
d
u
le summary: D
o
n't barf when invo
k
ed in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
bui
l
tin-notes: Add "copy" subcommand for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Misc
.
ref
a
c
t
oring of argc and ex
i
t value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
built
i
n-notes: Add -
c
/
-C opti
o
n
s
f
o
r
r
eusi
n
g
note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes:
R
e
factor h
a
ndling of -F option t
o
allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-no
t
es: Deprec
a
t
e
the
-m/-F opti
o
ns for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
b
u
ilti
n
-n
o
tes: A
d
d "append" subcommand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
b
u
iltin-notes: Add "add" subcomm
a
nd for
add
i
ng n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add --
m
essage/--file
aliases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes
:
A
dd "list" subcom
m
and
for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
D
oc
u
men
t
ation: Ge
n
e
r
aliz
e
git-notes docs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
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
Johan
H
erland
N
o
t
es API: prune_not
e
s(): Prune notes that belong t
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t3
3
0
5:
V
erify that removing
n
otes trigger
s
automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
bui
l
ti
n
-n
o
tes:
Add "remove" subcommand for
r
emoving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Te
a
ch builtin-no
t
es
t
o
r
e
m
ove
e
mpty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
Teac
h
n
o
t
es code to prope
r
l
y
pres
e
rve
non-note
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t3305: Veri
f
y
that adding many notes with git-not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3301: Verify successful
a
nno
t
ation of non-
c
o
m
mits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Bui
l
t
i
n-i
f
y git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refa
c
tor notes concatenation in
t
o a fl
e
xible inter
f
ace
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Notes API: Allow multiple concur
r
ent
n
otes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: write_notes_tree(): Store the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: for_
e
ach_note(): T
r
av
e
rse the
e
n
tire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
N
o
tes API: get_
n
o
t
e(): Retu
r
n the note
a
nn
o
t
a
t
i
ng the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API: remove_note(): Remove note objects fro
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
N
otes A
P
I: add_n
o
te():
Add not
e
objects to
the internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
Notes API:
init_notes(): In
i
tiali
z
e the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
A
d
d tests f
o
r check
i
ng co
r
rect handlin
g
of $GIT_NOTES_
R
EF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
No
t
es API: get_commi
t
_notes()
-> format_no
t
e()
+
remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next