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
t9114.2: Don't use --track option against "svn-remote"-tracking branches
2013-04-21
Johan
H
er
l
and
t9114
.
2
: D
o
n't u
s
e
--track o
p
t
i
on
a
gainst "svn-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t
7201
.
24:
A
d
d refspec to
k
eep
--tra
c
k worki
n
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t3
2
00
.
39:
trackin
g
s
etu
p
should fail if the
r
e i
s
no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
checkout: Us
e
r
e
mote refspec
s
when
DWIMming
t
r
acking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t20
2
4
:
Sh
o
w failure to us
e
refspec when
DWIM
m
ing remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t2
0
24: Add tests ver
i
fying current DWIM behav
i
or of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
g
i
t symbo
l
ic-ref --
d
elete $sy
m
ref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix fa
i
l
u
r
e to delete a packed re
f
through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan He
r
land
t1400-updat
e
-
ref: Ad
d
test verifying bug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
ha
n
Herland
notes-me
r
ge: Don't remove
.
git/NOTE
S
_MERGE_WORKTR
E
E
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an He
r
la
n
d
notes-merge: use
o
pendir/readdir instead o
f
using
rea
d
_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
t
3
3
10: illustrat
e
failure
to "notes merge
--co
m
mit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
f
ast-i
m
port: Fix i
n
co
r
r
e
ct fanout lev
e
l
when modifyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herl
a
n
d
t9301: Add 2n
d
testcas
e
exposi
n
g bugs
i
n fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t930
1
: Fix t
e
stca
s
e cove
r
ing up a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
J
ohan H
e
rlan
d
t5400: Fix
a
couple of
t
ypos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Mark dirs
t
at error me
s
s
ages f
o
r
translatio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve err
o
r
handling when par
s
ing dirs
t
at par
a
meter
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
New --dirs
t
at=li
n
es m
o
d
e,
d
oing dirs
t
at an
a
lysis
based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Allow specif
y
i
ng --di
r
stat
cut
-
o
ff percentage a
s
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
H
e
r
l
and
Add config vari
a
ble for specify
i
ng
d
efaul
t
--dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herla
n
d
Refactor --dirstat
parsing; d
e
pre
c
ate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herl
a
nd
Mak
e
--dirstat=0 outpu
t
directories
t
hat cont
r
ibute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erl
a
nd
Add
sev
e
ral testcas
e
s for --dirstat and
f
riends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat:
I
n cas
e
o
f
renames, u
s
e
tar
g
et filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan Herland
Tea
c
h --dirstat not t
o
completely
igno
r
e re
a
rra
n
ged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han
Herland
--dirstat-by-fi
l
e: Make it faster
and
more
c
orrect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--dirs
t
a
t: Describe non-obvious difference
s
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
Mak
e
"
g
it
notes
a
d
d
" more use
r
-
fr
i
e
n
dly whe
n
there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
lo
g
/
prett
y
-options
:
Do
c
u
m
ent --[no-
]
not
e
s a
n
d deprec
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han Herland
branch/check
o
ut --tr
a
ck: Ensure that upstream
b
ran
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Her
l
and
push
.
default: Ren
a
me 'tracking' to 'u
p
str
e
am'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Provide 'git
m
erge
-
-abort' as a sy
n
onym to 'git res
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
c
md_merge(): Pa
r
se options before chec
k
ing
M
ERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
rla
n
d
Prov
i
de '
g
it
n
otes get-ref' to easi
l
y
r
etrieve c
u
rrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erland
git notes
m
e
r
ge: Add testcas
e
s for merging notes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
g
i
t notes merge:
A
d
d
a
nother auto-
r
esolving st
r
ategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
gi
t
notes
merge
:
--commit shoul
d
fail if
u
nder
l
ying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes m
e
r
ge: Lis
t
co
n
flicting notes in notes merg
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes m
e
rge:
M
anua
l
conflict resolution, part 2
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
lan
d
git n
o
tes merge:
Manual c
o
nflict resolution, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Documentation: Preliminar
y
docs on 'git
notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes merge:
A
dd a
u
t
o
m
a
t
i
c
conflict resolv
e
rs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rland
git notes merge: Handle
r
e
al, non-conflicting not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
rl
a
n
d
builtin/notes
.
c: Refactor cr
e
ation of
n
o
t
es commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
g
i
t n
o
tes
m
erg
e
:
Init
i
al imple
m
entatio
n
handling
t
rivi
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
b
uiltin/notes
.
c
: Split
notes ref DWI
M
mery
i
nto
a
separ
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
c: Use
two newlines (instea
d
o
f one)
when conc
a
tenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
(trivial) t330
3
:
I
n
dent with tabs instead of sp
a
ce
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
notes
.
h/c: Propaga
t
e combine_notes
_
f
n return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
notes
.
h/c: Allow combine_n
o
tes fu
n
c
t
ions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
c
: Reorder functions in
p
r
e
paration for ne
x
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
h: Make de
f
a
u
lt_
n
ote
s
_ref() available in
n
otes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
H
erland
(trivial)
n
otes
.
h: Minor
do
c
um
e
ntation fixes to copy_n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
n
d
n
o
tes
.
c: Hexify SHA1 in die
(
) messag
e
fr
o
m init_n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan Herland
notes: D
o
n'
t
cre
a
te (empty)
co
m
mit
w
h
en removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
n
d
Enable
cus
t
om scheme
s
for column colors
in the graph
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Make graph_next_line() availab
l
e i
n
t
he grap
h
.
h AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herland
r
e
v
ision
:
Turn of
f
hi
s
t
o
ry
simplificatio
n
in --
a
ncestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan H
e
rland
revisi
o
n: F
i
x typ
o
in --ancest
r
y-
p
ath error mess
a
ge
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev-list-opt
i
ons
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentatio
n
/r
e
v-list-options
.
txt: Fix mis
s
ing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n Herland
d
i
f
f
.
c
:
Ensure
"index $from
.
.
$
t
o"
l
in
e
contai
n
s unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builti
n
-n
o
t
e
s:
Minor
(
mostly parse_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n
H
e
rla
n
d
submo
d
ule summary
:
D
on't barf w
h
en invoked in an
e
mpty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-not
e
s: Add
"
copy"
s
ubcommand for copying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
builtin-
n
ot
e
s: Misc
.
refactoring of argc and exit v
a
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin
-
notes: A
d
d -c/-C optio
n
s for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bui
l
tin-notes: Refa
c
t
o
r hand
l
ing of -F
option to a
l
low
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
bui
l
tin-notes: Depre
c
a
t
e t
h
e
-m/-F opt
i
ons for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
built
i
n
-
notes
:
Add "appe
n
d"
s
u
b
command f
o
r appendi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
:
Add "
a
dd"
s
ubco
m
mand for
adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
u
ilti
n
-notes: Add -
-
message/
-
-file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
b
uiltin
-
notes:
Add "li
s
t"
subcommand for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herl
a
n
d
Documentation: Generali
z
e git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
u
i
l
tin-note
s
:
A
d
d "prune" subcommand for
r
e
movi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Note
s
API: prune_no
t
es(): Prune notes tha
t
belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Verify that remo
v
ing notes triggers autom
a
tic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
bu
i
ltin-notes
:
Add
"
remove" subco
m
mand for
removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erla
n
d
Teach builtin-no
t
es to remove em
p
ty n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Teach
not
e
s code t
o
p
r
operly preserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
nd
t3305: Verify that a
d
ding ma
n
y note
s
with git-note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
t
3301: Verify succ
e
ssful annotatio
n
of no
n
-
commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
Builtin-ify gi
t
-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
erland
Refacto
r
notes con
c
atenat
i
on into a flexible interfac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: Allow mu
l
tiple concurrent notes trees
w
ith
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
Note
s
A
P
I:
w
rite_n
o
t
e
s_t
r
ee(): Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
N
o
tes API: for_each_
n
ote()
:
Traverse
t
he entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
N
otes API:
get
_
note():
Return the note annotat
i
n
g
th
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
Notes
A
PI
:
r
e
mo
v
e_no
t
e
(
): Remove
n
ote objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI:
add_no
t
e
(
)
: Ad
d
note
objects to the
i
nterna
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
N
otes API: init_notes
(
)
:
Initializ
e
the n
o
tes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
e
r
l
a
nd
Ad
d
t
e
sts for checking cor
r
e
ct handling of
$GIT
_
NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Notes API:
g
et_commit_notes() -
>
format_note() +
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Mi
n
o
r cosmetic fixe
s
to notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
builtin-config: Fix crash when using "-f
<
relativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
an Herland
Add more testcases to test fast-import
o
f
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan He
r
land
Ren
a
m
e t
9
301 to t9350, to
m
a
ke room for
more fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast
-
i
m
port: Proper notes tree manipulati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan
H
e
r
land
Fix crasher on encount
e
rin
g
S
HA1-like non-not
e
in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next