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: refactor note file path into struct note_data
2014-11-10
Joha
n
He
r
land
builtin/notes: refactor note file path
i
nto str
u
ct
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
J
o
ha
n
Herl
a
nd
builtin/notes
:
impr
o
v
e
na
m
ing
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
t330
1
: v
e
rify that 'git note
s
' removes e
m
pty
n
otes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
J
ohan Herland
built
i
n/note
s
: fix premature failure whe
n
t
rying to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-04-19
Johan Herla
n
d
Git 2
.
0: git svn:
Set default
-
-prefi
x
='origi
n
/' if
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-02-20
Johan
H
erland
notes: disallow reusing non-blob
as a note object
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-28
Johan Herland
sha1_fi
l
e
.
c:c
r
eate_tmpfile(
)
: Fix race w
h
en cre
a
ti
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan Her
l
and
git-svn: Warn about chan
g
ing default f
o
r -
-
prefix
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan
H
erland
Documentation/
g
it-svn:
Promot
e
th
e
use of --
p
r
efi
x
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-24
J
ohan Herland
sample
pre-commit hook
:
use -
-
bool
w
hen
r
etr
i
eving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3
2
00:
A
dd test de
m
o
n
stra
t
ing mino
r
reg
r
essio
n
in 41
c
2
1
f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han
Herland
Refer to branch
.
<nam
e
>
.
re
m
ote/merge w
h
en
d
ocumenti
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan H
e
rland
t3200:
Minor
f
ix wh
e
n prepar
i
ng for tracking failure
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t2024: Fi
x
&&-chaining
and a
couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herl
a
nd
Move create_notes_com
m
it
(
) from
note
s
-mer
g
e
.
c
into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
M
o
ve copy_n
o
t
e
_for_rewrit
e
+
friends
f
rom builti
n
/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Jo
h
an H
e
rla
n
d
finish
_
copy_not
e
s
_for_rewrite(): Let
caller
p
rovide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
rland
g
l
ossary: Update and
r
ephrase the defini
t
ion of a re
m
ote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
branch
.
c: Validate t
r
a
c
king b
r
anch
e
s with
refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an He
r
la
n
d
t9114
.
2: Don't use --track option against
"svn-re
m
ote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
t
7
201
.
24: Add refs
p
ec to keep --
t
rack working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan H
e
r
l
and
t
3200
.
39: tracking se
t
up
should
f
a
il if th
e
re i
s
no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herl
a
n
d
checkout: Use rem
o
te r
e
fspecs when DWIM
m
ing t
r
acki
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
H
erland
t2024: Show failure
t
o use r
e
fspec when DWIM
m
ing r
e
mote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t202
4
: Add tests v
e
rif
y
i
n
g current DWIM beha
v
i
or of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erl
a
n
d
git symbolic-ref --delete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joh
a
n Herla
n
d
Fix failure
to del
e
te a pa
c
k
ed ref throu
g
h a
sym
r
ef
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
o
h
an He
r
land
t1400-update-r
e
f: Add t
e
s
t v
e
rifying bug with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
a
n
H
erla
n
d
n
otes-merge
:
Don't re
m
ove
.
g
i
t
/NOTES_
M
ERG
E
_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
a
n Herland
not
e
s-merge: use opendir/
r
e
addir
i
nste
a
d of usi
n
g r
e
a
d_dir
e
c
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han
H
erla
n
d
t
3
310: illustrate failur
e
to "not
e
s merge --
c
ommit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herlan
d
f
ast-import
:
Fix incorrect fanout level wh
e
n
modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add 2n
d
testcase exp
o
sing bugs in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
e
r
land
t9301: Fix testcase
c
o
verin
g
up a bug in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
H
e
rland
t5400
:
Fix a co
u
ple
o
f typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herl
a
nd
Mark dirs
t
at e
r
ror messages for trans
l
atio
n
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
nd
Impro
v
e error handl
i
ng when pars
i
ng dirs
t
at parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
ha
n
Her
l
and
New
--dirstat=li
n
e
s
mod
e
, do
i
ng dirstat ana
l
ysis
b
ase
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herland
A
llow spec
i
fying --d
i
rstat cu
t
-of
f
perce
n
tage as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Add
c
onfig v
a
riable for specifying default --d
i
rstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Her
l
and
Refactor --dir
s
t
a
t pa
r
sing
;
d
e
p
recate --cu
m
ulat
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
M
ake
--dirstat=0 output di
r
ec
t
ories that co
n
tribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herl
a
nd
Add
s
evera
l
testcases for
-
-dirstat and friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
J
oha
n
Herla
n
d
-
-dirstat: I
n
c
a
s
e
o
f renames
,
use t
a
rget fi
l
e
name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n
H
erland
Te
a
ch --dirs
t
at not t
o
completely i
g
nore rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
n
d
--dirstat-by-file: M
a
ke it faster and more cor
r
ect
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
r
land
-
-
di
r
s
ta
t
: Desc
r
ibe
n
o
n-obvious differences r
e
lative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
o
h
an Herland
Make "
g
it notes add" mor
e
user-friendly when ther
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
log/pretty-option
s
: Doc
u
ment --[no-]not
e
s an
d
deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan
Herland
branch/checkout --track: E
n
su
r
e that upstream
b
ranch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default: Rename 't
r
acking' to '
u
pstream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Provide 'git merge
--ab
o
r
t
'
a
s a synonym to 'git r
e
set
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd
_
merge():
P
a
r
s
e options before checking M
E
RGE_HEA
D
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herla
n
d
P
r
ovide 'g
i
t
n
otes get-ref' to easily retrieve
curr
e
nt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merge
:
Add testcas
e
s for merging n
o
tes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Her
l
a
n
d
gi
t
notes me
r
g
e
:
Add an
o
th
e
r
auto-
r
eso
l
v
i
ng
st
r
ategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes merge: --comm
i
t should
f
a
il if
u
n
derlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erland
git
n
otes mer
g
e: List conflicting
notes in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n H
e
rlan
d
git not
e
s merge: Manual conflic
t
r
esol
u
tion,
p
art 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herla
n
d
git notes merge: Manual confl
i
ct resoluti
o
n, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Do
c
ument
a
t
i
o
n: Preli
m
i
n
ary doc
s
o
n
'git
notes me
r
ge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
git notes m
e
rge: Add
a
u
tom
a
t
ic conflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git not
e
s merge: Handle real, non-conflicti
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
bu
i
ltin/notes
.
c
:
Refactor cre
a
tion of
no
t
es commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
e
r
land
git not
e
s mer
g
e
: I
n
itial implementation hand
l
ing trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
b
u
iltin/notes
.
c: Split notes ref DWIMmery into
a
sep
a
rat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
notes
.
c: Use two n
e
w
l
i
nes (instead o
f
o
ne) when
c
oncatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(trivial)
t
3
3
03:
I
n
d
ent with tabs instead
o
f spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
notes
.
h/c: Pro
p
agate co
m
b
i
ne_notes_fn return value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
not
e
s
.
h/c: Allow combine_note
s
f
u
nctions to remo
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c:
R
eorder functions in preparation f
o
r
next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
h: Make default_notes_ref() a
v
ailable in
n
otes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
(
t
r
ivial) notes
.
h: Minor docu
m
e
n
tation fixes to copy_notes(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herland
notes
.
c
: Hex
i
fy SHA1
i
n die() message
f
rom init_notes
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herlan
d
notes: Don't c
r
eate (empty) com
m
it when removing no
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rl
a
nd
Enable
custom sch
e
mes for column co
l
ors i
n
the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
M
a
ke graph_ne
x
t_line() availa
b
le in the
graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
revisi
o
n: Turn off hist
o
ry
s
i
m
plification in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herlan
d
r
ev
i
sion: Fix typo in --
a
ncestry-p
a
th er
r
or messag
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
an Herl
a
nd
Docume
n
tation/r
e
v-list-opti
o
ns
.
txt: Explain --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev
-
list-o
p
tions
.
t
x
t
:
Fix
m
issing
l
ine
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
J
o
han
He
r
l
a
nd
diff
.
c: Ensure "index $from
.
.
$to" line contains
unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an Her
l
an
d
bui
l
tin-n
o
t
e
s: Minor (
m
ostly parse_opti
o
n
s
-relat
e
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n Her
l
and
submodule summary: Don'
t
b
arf when invoked in
an emp
t
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
b
uiltin
-
notes:
A
dd "copy" subcommand for
copy
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-notes: Mis
c
.
refactoring o
f
argc and exit v
a
lu
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
builtin-notes: Add -c/-C
opt
i
ons for reu
s
ing no
t
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-no
t
es: Refactor ha
n
dling o
f
-F option to
a
l
low
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
i
n-not
e
s: Depre
c
ate
th
e
-m/-F o
p
tions for "
g
it
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
t
in
-
notes: Ad
d
"append" subco
m
mand f
o
r appe
n
ding
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin
-
note
s
: Add "
a
dd" su
b
com
m
a
n
d
for adding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
builtin-notes
:
Add --m
e
ss
a
ge/--file
a
l
i
ases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Ad
d
"list" subcommand
for
l
isting note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
Herland
Documentatio
n
:
Generalize git
-
not
e
s docs to
'
objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: Add "pr
u
ne" s
u
bco
m
m
a
n
d
for rem
o
vin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
otes
A
PI: p
r
u
n
e
_notes(): Prune notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
t3305: Verify that removin
g
notes triggers automa
t
ic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builtin-notes: Add "remove" subcomm
a
nd for r
e
moving
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
T
each
b
uiltin-notes to
r
emove e
m
p
t
y notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
n
otes code to
p
roperly pr
e
se
r
ve
non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next