repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
builtin/notes: fix premature failure when trying to add the empty blob
2014-11-10
J
ohan Herland
builtin/notes: fix p
r
emat
u
r
e failure
when try
i
ng to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-04-19
Johan He
r
land
Git 2
.
0: git svn: Set d
e
fault --prefix
=
'
o
r
igin/' if
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-02-20
J
o
h
a
n He
r
l
a
nd
note
s
: disallow reusing no
n
-blo
b
as a note obj
e
ct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-28
Johan Herlan
d
sha1_fi
l
e
.
c
:
create_tmpfi
l
e(
)
: Fix race when creat
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan
Herla
n
d
git
-
s
vn: Warn about cha
n
g
i
ng
d
efault for -
-
prefix
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Joh
a
n Her
l
and
D
ocumentation/git-s
v
n: Promote the
u
se
o
f
-
-pref
i
x
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-24
Johan
H
erlan
d
sample pre-commit hook: use --bool when retrieving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rland
t3
2
00: Add test demonstrati
n
g minor
r
egre
s
sion in 41c21f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Her
l
an
d
Re
f
er
t
o
b
ran
c
h
.
<name>
.
rem
o
te/me
r
ge when do
c
ument
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t320
0
: M
i
nor fi
x
when preparing for tracking failur
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024:
Fix &&
-
chaining and a
c
o
uple
o
f
t
ypos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan
H
erland
Move
c
re
a
te_
n
o
t
es
_
co
m
mit() from notes-merge
.
c int
o
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
M
o
ve copy_note_for
_
rewrite + fr
i
ends from builtin/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_copy_notes_for_rewrite(): Let calle
r
prov
i
de
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
g
l
o
s
sary: U
p
date and rephras
e
the defi
n
ition of a rem
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
b
ranch
.
c: Val
i
date
t
ra
c
king branches with re
f
spec
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
t91
1
4
.
2: Don't use --tr
a
ck option against "svn-remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
7201
.
24:
A
dd refs
p
ec
t
o keep --track working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t3200
.
39: t
r
acking
s
etup shou
l
d f
a
il if th
e
re is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
che
c
k
ou
t
: Use remote
r
e
f
specs when DWIMming t
r
acki
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t
2024: S
h
o
w failure to use ref
s
p
ec
when
D
W
I
M
m
i
ng remo
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t2
0
24: Add tests ver
i
fying current DWIM
behavior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an Herla
n
d
git symbolic-ref --delete $symr
e
f
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an Herland
Fix failure to d
e
lete a packed
ref th
r
ough a symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herland
t140
0
-u
p
date-ref:
A
dd
test verifying bug
w
ith symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
n
o
te
s
-merge:
D
o
n't remove
.
gi
t
/NOTES_MER
G
E_
W
O
R
K
T
R
EE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: use op
e
ndir/readdir ins
t
ead of using read
_
dire
c
.
.
.
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: illustrate failu
r
e to "note
s
m
e
r
g
e --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erland
fa
s
t-impor
t
: Fix inco
r
re
c
t fanout level when modif
y
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t
9
301: Add
2
nd testcase exposing bugs in
f
a
s
t-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
t9301: Fi
x
t
e
stcase cov
e
ring up a bug in f
a
st-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fix a c
o
u
p
le of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dirst
a
t er
r
or mes
s
a
g
es for translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an Her
l
and
Improve
e
rror
handling when p
a
rs
i
ng dir
s
tat
p
aramete
r
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herl
a
nd
New --dirst
a
t=lines mode, doing dirstat a
n
aly
s
is
b
ased
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Allow specifying --dirs
t
at cut-off
perc
e
ntage
as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Add co
n
fig
v
ariabl
e
for
s
pecifying
default --dirsta
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
H
erland
Refactor --dirstat parsing; deprecat
e
--cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Make -
-
dirs
t
at=0
o
utput directories th
a
t contribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
s
ev
e
ral t
e
st
c
as
e
s
for --dirstat
a
n
d friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
J
ohan Herland
-
-
di
r
stat: In case of
r
enames
,
use
t
arget filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
Herla
n
d
Teach --dir
s
tat
n
ot to compl
e
t
e
ly ignor
e
rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirsta
t
-by-file: Make it fa
s
t
er and
m
ore cor
r
ect
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
--d
i
r
stat: Describe no
n
-obvio
u
s differences relativ
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Her
l
a
n
d
M
ake "git notes ad
d
" mo
r
e use
r
-friendly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan H
e
rland
log/pretty-opt
i
ons
:
Document --[no-]notes and de
p
re
c
ate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Joha
n
Herlan
d
branch/che
c
kout
-
-
t
rack:
E
nsure that
u
pstr
e
am branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan
Herland
p
u
s
h
.
d
e
fault: Rename '
t
ra
c
k
i
ng' to 'ups
t
r
e
am'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
P
r
o
v
i
de 'git merge --abort' as a synonym to 'g
i
t reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_m
e
r
ge(): Parse optio
n
s before checkin
g
M
ER
G
E_H
E
A
D
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
la
n
d
P
r
ovide
'
g
i
t
notes get-ref' to easi
l
y retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git
n
ot
e
s merg
e
:
A
dd testcases
f
or
merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it
n
ot
e
s
m
erge: Add another
a
uto-resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
land
git
n
o
tes me
r
ge
:
--
c
ommit shoul
d
fail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t n
o
t
es merge: List conflicting notes in
n
ot
e
s merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
git notes me
r
ge: M
a
n
u
a
l conflict resolution,
part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
git notes merge: Manual conflic
t
resolution
,
part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
Documentation: Pr
e
liminary
d
ocs on
'
git notes
merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add automa
t
i
c
conflict re
s
olvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Handle real, n
o
n-c
o
nflicting
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
builti
n
/n
o
tes
.
c: R
e
f
a
c
t
or creat
i
on
o
f not
e
s commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes me
r
ge: I
n
itia
l
implementation
h
andling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
builtin/
n
otes
.
c:
S
plit notes
ref DWIMmery into
a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
notes
.
c: Use two newlines (i
n
stead of on
e
)
when con
c
a
tenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herland
(trivial) t3303: Inden
t
with
tab
s
i
n
stead
of
s
p
aces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/
c
: Propagate combine_no
t
es
_
fn
return va
l
u
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
te
s
.
h/c: Allow combine_notes
f
unctions
to
r
emove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Her
l
and
no
t
es
.
c
:
Reo
r
der funct
i
ons in
p
reparation
for
n
ext
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n
Herland
n
otes
.
h: Make defaul
t
_n
o
tes_ref() av
a
ilabl
e
in not
e
s API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
(
trivial) notes
.
h
:
Mi
n
or
d
ocumentation fixe
s
to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
n
otes
.
c: H
e
xify
SHA1 in die() m
e
ssage from init_no
t
e
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
a
n H
e
rland
notes: Don't cr
e
ate (empty) commit when rem
o
vi
n
g non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herl
a
n
d
Enable custom schemes for column colors in the graph
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herl
a
nd
Mak
e
graph_next_line(
)
ava
i
lable
i
n the gr
a
ph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revisio
n
: Turn
o
ff histo
r
y simplification
i
n --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
revisi
o
n: Fix typo i
n
--ancestry-path
e
rror m
e
ssage
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
Do
c
umenta
t
ion/r
e
v-list-options
.
txt: Explain --ance
s
try
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
han Herland
Documen
t
at
i
on/re
v
-list-options
.
t
x
t: Fix missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Her
l
and
diff
.
c: Ensure "inde
x
$f
r
om
.
.
$to"
l
ine contains un
a
mbiguo
u
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herl
a
nd
bu
i
ltin-notes: Mino
r
(
mostly p
a
r
s
e_o
p
t
i
ons-r
e
late
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan H
e
r
l
a
nd
s
u
bmo
d
u
le s
u
m
m
ary: Don'
t
barf when i
n
voked in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes: Add
"
copy" s
u
bcommand f
o
r c
o
p
ying n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes:
Misc
.
refactorin
g
of a
r
gc and
e
x
i
t value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
built
i
n-n
o
tes: A
d
d -c/-C options for
r
eusing
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin
-
notes: Refactor handling of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
built
i
n-notes: D
e
p
r
ecate th
e
-m/-F
o
ptio
n
s for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
H
erland
builti
n
-no
t
e
s: Add "append" subcommand for app
e
nding
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-note
s
: Add "add"
s
u
b
command for
addi
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builti
n
-notes: Add --messa
g
e/--file alia
s
e
s for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin
-
notes: Add "list" subcomman
d
f
or lis
t
ing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Doc
u
mentatio
n
: Gen
e
r
alize git
-
n
otes docs
t
o 'ob
j
ects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
i
n
-notes: Add
"
pru
n
e"
s
ub
c
o
m
mand
for rem
o
ving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes
A
PI: pr
u
ne_no
t
es():
P
rune notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t
3
30
5
:
Veri
f
y
t
h
at
r
emoving
n
otes tr
i
ggers aut
o
m
a
tic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bui
l
tin-notes: Add "
r
emove"
s
u
bco
m
mand for
r
emovin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Teach builtin
-
notes
t
o remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
T
each notes code to proper
l
y pr
e
serve non-n
o
tes
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305:
Verify
t
h
at adding man
y
not
e
s w
i
th
g
i
t-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t330
1
: Verify succe
s
sful annota
t
io
n
of non-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Built
i
n-ify git-
n
otes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next