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
Second batch for 2.3 cycle
2014-11-14
Johan Herla
n
d
t
3
3
01: modernize styl
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
J
ohan
H
er
l
and
notes
:
empty
notes
s
h
o
uld be show
n
by 'g
i
t log'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan He
r
land
builtin/no
t
es: add --
a
llow-empty, to allow stori
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Her
l
a
n
d
builtin/notes: split creat
e
_note(
)
to clar
i
fy add vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan
H
erla
n
d
bu
i
ltin
/
n
o
t
e
s: s
i
mp
l
ify ear
l
y exit code in
a
d
d()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
ohan Herland
bu
i
ltin/notes: ref
a
ctor note file path
i
n
to struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Joh
a
n Herland
builti
n
/notes: improve
n
aming
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
J
o
han Herl
a
nd
t3301: verify that 'git notes' removes empty notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Joh
a
n Herland
builti
n
/notes: fix premature
failure when try
i
ng to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
J
o
han H
e
r
l
a
nd
Git 2
.
0
: gi
t
s
v
n
:
Set def
a
ult
-
-
p
r
efi
x
='o
r
igin/'
if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Johan
H
e
rl
a
nd
notes: disallow reusing n
o
n-b
l
o
b as a n
o
te object
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Johan Herland
s
h
a1_file
.
c:
c
reat
e
_tmpfile(
)
: Fix race when creati
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan H
e
rland
git-svn: Warn abou
t
cha
n
g
i
ng
d
e
f
ault for --prefi
x
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Herland
Docume
n
tation
/
g
it-s
v
n: Promote
t
h
e use
o
f --prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
Johan
He
r
land
s
ample pre-commit hoo
k
: use --bool w
h
en retriev
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herlan
d
t3200: A
d
d test demonstra
t
ing
m
i
n
or
r
egression
in 41c
2
1f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joh
a
n Herland
Refer
to
branch
.
<n
a
me
>
.
remo
t
e/merg
e
when d
o
cumenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
ha
n
Herland
t3200: Minor fix whe
n
preparing for trac
k
i
n
g
failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
Herland
t2024: Fix &&-chaining and a couple of typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move create_notes_com
m
it() from notes-merge
.
c
int
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
o
han Herlan
d
Move cop
y
_note
_
for_rewr
i
t
e + friends from bu
i
ltin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an H
e
r
l
and
finish_copy_notes_for_rewrite(): L
e
t
caller pr
o
vide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
gl
o
ssary: Update and
r
ephra
s
e the
defini
t
ion of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
bra
n
ch
.
c: Validate trackin
g
bra
n
ches with ref
s
pecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t9114
.
2
:
Don't u
s
e -
-
tr
a
ck option against "svn-remo
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
ha
n
Herland
t
7201
.
24: A
d
d
r
e
f
spec to
k
eep --track
w
orkin
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t3200
.
39: tracking setup sho
u
ld fa
i
l if ther
e
is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erla
n
d
checkout: Use remo
t
e
r
e
fspec
s
when DWIMming tracking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joha
n
Herland
t
2024:
S
how failure to use
r
e
f
sp
e
c when DWIMming remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herl
a
nd
t2024:
A
dd tests
v
e
r
ifying current DW
I
M
behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han H
e
rland
git symboli
c
-
ref --delete
$symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix fa
i
lure to
d
e
l
e
te
a packed ref throug
h
a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Her
l
and
t1400-upda
t
e-ref: Add test veri
f
y
ing bug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herlan
d
n
o
te
s
-merg
e
: Don't remove
.
git/NO
T
ES_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: use opendir/r
e
a
d
dir
instead 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
J
ohan
Herland
t33
1
0: illust
r
ate f
a
ilure to
"
notes
m
erge -
-
commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
han Herland
fa
s
t
-
import: Fix incorrect fanout l
e
vel when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t93
0
1: Add 2nd testcase exposing bug
s
i
n fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: F
i
x tes
t
c
a
se cover
i
n
g
u
p
a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herla
n
d
t5400
:
Fix a
c
oup
l
e of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
ha
n
H
e
r
land
Mark d
i
rst
a
t err
o
r messages for trans
l
atio
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
r
land
Improve err
o
r handling when pa
r
s
i
ng dirstat p
a
rame
t
ers
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
N
e
w --di
r
stat=lines mode
,
d
oing dirsta
t
anal
y
sis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Allow s
p
e
cifying
-
-dirstat cut
-
of
f
p
e
r
c
e
ntage as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config variable f
o
r
spe
c
ifying default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herl
a
n
d
Re
f
act
o
r --dirstat parsin
g
;
depr
e
cat
e
-
-c
u
mulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herl
a
nd
Make --
d
irstat=0 output directories
tha
t
c
ontri
b
ute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Add seve
r
a
l
t
estcases for --dir
s
tat and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n
H
erland
--dirstat:
I
n
case of re
n
ames, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dir
s
tat not t
o
completely ignore re
a
r
r
anged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-fil
e
:
M
ake it f
a
ster
a
nd mor
e
corr
e
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erl
a
n
d
--dirstat: Descri
b
e
non-obvious di
f
fe
r
e
n
c
es relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
J
o
han
H
e
rland
Make
"gi
t
no
t
es a
d
d" more user-friendly when the
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
log/pr
e
tty-options: Document
-
-[no-]notes
an
d
deprec
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an Her
l
and
bran
c
h/checkou
t
--track: Ensur
e
that upstream
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan
He
r
land
push
.
d
e
fa
u
lt:
R
ename
'tracking' t
o
'ups
t
re
a
m'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
He
r
land
P
r
ovide 'gi
t
m
e
rge --abort' as a synonym to
'git
r
e
set
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
cmd_me
r
g
e
(): Parse options before
checking MERGE_H
E
A
D
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git notes get-ref' to
e
asily retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge
:
Add testca
s
es for merging notes
t
rees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge: Add another
auto-resolving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
la
n
d
g
it notes mer
g
e: --commit
s
ho
u
ld fail if underlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
a
nd
git notes m
e
rge: L
i
st conflicting notes in notes
m
erge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
erge
:
M
anua
l
conf
l
ict
r
esolution,
p
art 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git n
o
tes merg
e
: Manu
a
l confli
c
t res
o
lution, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
land
Documentati
o
n:
P
r
eliminary doc
s
on 'git not
e
s merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git notes merge: Add autom
a
tic con
f
lict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n Herland
g
i
t
notes m
e
rge:
Handle real, non-
c
onflicting n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bu
i
ltin/notes
.
c
:
Refactor cr
e
a
t
i
on of no
t
e
s commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
note
s
merge: Initial implementation handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Sp
l
it
n
otes ref DWIM
m
ery i
n
to a separ
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
notes
.
c
:
Use two
n
e
w
lin
e
s (i
n
st
e
ad
of o
n
e) when conca
t
enatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(
trivial) t3303: Indent w
i
th tabs
i
nstead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
notes
.
h/c
:
Propagate co
m
bine_n
o
tes_fn re
t
urn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
e
r
land
n
o
t
e
s
.
h
/c: Allow
combine_notes fu
n
cti
o
n
s t
o
remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
notes
.
c: Re
o
r
d
er functions
i
n
prepar
a
tion
f
or next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
h: Make def
a
u
l
t_notes_ref(
)
a
vailable in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(tri
v
ial) notes
.
h
: Minor
do
c
umentati
o
n fixes to copy_n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c: Hexify SHA1 i
n
die() me
s
sage from init_notes(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
an Herland
n
otes: Don't create (empty
)
commit when removi
n
g n
o
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an He
r
land
Ena
b
le c
u
stom schemes for column colors in the gra
p
h
A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Make
graph_next
_
line()
a
v
ailab
l
e
i
n
the grap
h
.
h
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
r
lan
d
revisio
n
: T
u
rn
o
ff history simplification in --ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revision: Fix typo in --ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
D
o
cumentation/rev-list-options
.
txt
:
E
xpla
i
n --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev-list-opt
i
ons
.
t
x
t: Fi
x
m
i
s
si
n
g
li
n
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
rland
diff
.
c
:
En
s
ure "index $from
.
.
$
to" line conta
i
ns unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an Herland
bu
i
lti
n
-notes
:
Minor (most
l
y parse_options
-
r
el
a
ted
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
h
a
n
H
er
l
an
d
submodule sum
m
ary: Do
n
'
t
barf when
i
n
voked in
a
n empt
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
built
i
n-
n
otes
:
Add
"copy
"
subcomm
a
nd for cop
y
i
ng
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
i
n-
n
otes: Misc
.
refactoring of argc and e
x
it
valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builti
n
-notes: Add -c/-C
opti
o
ns for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
builtin-notes: Refactor handling of -F opt
i
on to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
n
d
builtin-no
t
es:
D
eprecate the -m/-F options for "g
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "a
p
pe
n
d" sub
c
ommand fo
r
appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
b
u
i
l
tin-notes:
A
d
d "add" subcommand for add
i
ng
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
lan
d
builtin-
n
otes: Add --message/--file aliases
f
o
r
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
Add "list" subc
o
mma
n
d
for listin
g
note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
Do
c
ume
n
tation
:
Generalize git-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
bu
i
ltin-note
s
: Add "prune" su
b
command f
o
r remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next