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
Merge branch 'jc/upload-pack-send-symref' into maint
2013-09-09
Joh
a
n Herland
t3200: Add
t
est
d
e
monst
r
a
t
i
n
g minor regression in
41c21
f
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herland
Refer to bra
n
ch
.
<
name
>
.
r
em
o
te/merge when
docum
e
nti
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t320
0
: Minor fix
w
hen pr
e
p
a
ring for trac
k
ing failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t
2024:
F
ix
&&
-
chain
i
ng a
n
d
a
couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
H
erland
Move create_notes_comm
i
t
(
)
from notes-merge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
Herland
Move
copy_note_for_rew
r
ite + frien
d
s
from
bu
i
ltin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
f
inish_
c
opy_notes_
f
or_
r
ewrite
(
): Let caller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herl
a
nd
glossary: Updat
e
a
n
d
re
p
hrase the defi
n
i
tion of
a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
branch
.
c: Validate trackin
g
b
r
anches with refspecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
nd
t
9
114
.
2:
D
o
n't use
-
-tr
a
ck option a
g
ains
t
"s
v
n-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t7201
.
24: Add refspec
t
o
ke
e
p
--track working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t3200
.
39: tracking setu
p
shoul
d
fail if there is
n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
chec
k
out: Use remote refspecs when DWIM
m
ing
tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
a
nd
t2024: Show fa
i
lure to use refspec when DWIMming
r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t2024: Add tests
v
e
rifying current DWIM
b
ehavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
e
r
l
a
nd
gi
t
symboli
c
-ref --delete $symr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
Herl
a
nd
Fix failure
t
o dele
t
e
a pac
k
ed
r
e
f t
h
r
ough
a
s
y
mref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
H
e
r
l
and
t1
4
00
-
update
-
ref: Add tes
t
verifying b
u
g with
symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-
m
erg
e
: Don'
t
remove
.
git/NO
T
ES_MERGE_
W
O
R
K
T
REE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan Herland
notes
-
merge: use o
p
endir/readdir inste
a
d of
u
sing 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
H
erland
t3310: i
l
l
u
strate failure to "notes merge -
-
commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast
-
import:
F
ix incorrect fano
u
t level
w
h
e
n
modi
f
y
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
t93
0
1: Add 2nd t
e
stcase exposi
n
g bugs in fa
s
t-
i
m
p
o
r
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
Herland
t930
1
: F
i
x te
s
tcase covering up a bug in fas
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t54
0
0:
F
i
x
a couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark di
r
s
t
at
e
rror messag
e
s for
tran
s
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Her
l
and
Improve error
h
andling when parsing
dir
s
tat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
New
--dirstat=lin
e
s
mode, doing dirs
t
at anal
y
sis bas
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
er
l
a
n
d
All
o
w
specifying --dirstat cut-of
f
percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config variable for specifyi
n
g default --dirsta
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
R
efact
o
r --dirstat parsi
n
g; deprecate
--cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Make
--dirs
t
at=0 output dir
e
cto
r
ies
t
h
at c
o
ntribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
Add severa
l
testcases for --dirstat and
f
r
iends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Herland
--dirstat: In
c
ase of renames, use t
a
r
g
et filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach
-
-dir
s
ta
t
not to completely i
g
nore rearrang
e
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han He
r
l
a
nd
--dirstat-by-file: Mak
e
it faster and more corre
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
irstat: Describe non-o
b
v
i
o
u
s
diff
e
r
e
nces
r
e
l
ative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han H
e
rland
Make "git
n
otes add"
more user-friend
l
y
when
ther
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
ha
n
H
e
r
land
log/
p
r
etty
-
options: Document --
[
no-
]
notes and dep
r
ecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch
/
checkout -
-
t
r
ack: Ensure that upstream bran
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herland
push
.
default: Rename 'tr
a
cking'
to
'up
s
tream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
lan
d
Provide 'git m
e
rge --abort
'
as a sy
n
onym
t
o
'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herland
c
m
d_merge()
:
Pars
e
options bef
o
r
e
checki
n
g
MERG
E
_
H
EAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Provide
'
g
i
t 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 note
s
merge: Add testcases for merging
n
otes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Her
l
and
git notes m
e
r
g
e: Add
anot
h
er auto-reso
l
ving st
r
ategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
Herl
a
nd
g
it n
o
tes merge:
--comm
i
t should fail
i
f underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
git notes
m
e
r
ge
:
Lis
t
confl
i
ct
i
n
g n
o
t
e
s in n
o
tes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: Manual conflict resolution, part
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
git note
s
m
e
rg
e
:
M
a
n
u
a
l conflict re
s
olutio
n
, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herla
n
d
Do
c
ument
a
ti
o
n: Pr
e
liminary docs
o
n 'git
not
e
s merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
gi
t
notes me
r
g
e: Add au
t
omati
c
conflict
resolve
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
Herland
git
n
otes
merge:
Handle r
e
al, non-co
n
flicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rlan
d
bu
i
ltin/notes
.
c: Ref
a
ctor creation of n
o
t
es
c
o
m
mits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
te
s
merge: Initial imple
m
ent
a
tion handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herlan
d
b
uiltin/notes
.
c:
S
pli
t
notes re
f
DWIMmery into a
separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
rland
not
e
s
.
c: Use two newlines (instead of one) whe
n
concaten
a
t
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n Herland
(trivial
)
t3303: Indent w
i
t
h
ta
b
s instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
note
s
.
h
/c: Propagate combine
_
notes_f
n
return
valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herl
a
nd
n
otes
.
h/c
:
Allow com
b
ine_notes functions to
r
em
o
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
c: Reorder funct
i
ons in preparation f
o
r next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n
Herland
notes
.
h: M
a
k
e
defa
u
l
t_notes_
r
ef
(
) a
v
aila
b
le in n
o
t
e
s API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
(trivia
l
) notes
.
h: Minor
docum
e
ntatio
n
fi
x
es to copy_note
s
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
c: He
x
ify SHA1 in die() m
e
ssage
f
r
om init_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
a
n Herlan
d
not
e
s: Don't create (empty) commit w
h
en remo
v
ing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an H
e
rlan
d
Enabl
e
cus
t
om schemes
for column
c
olors in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_next_line() a
v
ailable in
th
e
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han H
e
rl
a
nd
revis
i
o
n
: Turn off
h
i
story simplification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
revision:
F
ix
typo in --
a
ncestry-path err
o
r
m
essage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
o
c
ume
n
tation/rev-list-options
.
txt: Explain -
-
a
ncestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
lan
d
Docu
m
enta
t
ion/r
e
v-li
s
t-
o
ptions
.
txt:
Fix missi
n
g line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herland
dif
f
.
c: Ensure "ind
e
x
$
f
rom
.
.
$
to
"
line c
o
ntains
u
nambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
H
erla
n
d
builtin-notes
:
Minor
(
mo
s
tly parse_options-re
l
a
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
ohan Herland
submodule s
u
mmary: Don't bar
f
wh
e
n invoked in
a
n empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
A
dd "copy" subcommand for copying
n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s: Misc
.
refactori
n
g o
f
a
rgc and
exit
v
alue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herla
n
d
builtin-no
t
es: Add -
c
/
-
C options
f
or r
e
using notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
b
u
i
lt
i
n-notes: Refactor handling of -F opti
o
n
to al
l
ow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-notes: Deprecate the -m/-
F
option
s
for
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
builtin-no
t
e
s
:
A
dd
"append" subco
m
mand for a
p
pending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: Add "ad
d
" subcomma
n
d for adding note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
built
i
n-notes: Add --m
e
ss
a
ge/--fi
l
e alia
s
es for
-
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
builtin-
n
otes: Add "li
s
t
" subcommand for li
s
ting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
He
r
lan
d
Docum
e
ntation: Ge
n
eralize g
i
t-notes
docs t
o
'object
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin
-
n
o
tes: Add "prune"
subcommand fo
r
r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
ot
e
s API: prune_notes(): Prune no
t
es
t
hat belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
t
3
305:
V
erify that
r
emoving not
e
s
t
riggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
Herland
builtin-notes: Add "rem
o
ve
"
subc
o
mmand
f
or rem
o
ving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach builtin-not
e
s to
r
e
mo
v
e
empt
y
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach no
t
e
s
code to properly p
r
eserve
n
on-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n Her
l
and
t3305
:
Verif
y
that ad
d
ing many notes with git-no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t3
3
01: Ver
i
fy successful annotatio
n
of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n H
e
rland
B
u
i
lti
n
-
ify git-no
t
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Ref
a
ctor note
s
concatenation into a flexible int
e
rfac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes API: Allow multiple concur
r
e
n
t
n
otes
tree
s
w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes
API: write_notes_tree(): Store the notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes API: for_each_note():
T
raverse th
e
entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
Notes API:
g
et
_
note(
)
: Retur
n
the note annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erlan
d
Notes API:
remove_note(): Remove note objec
t
s
f
r
om
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: add_note(): Add note objects to the i
n
ternal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next