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
t3301: modernize style
2014-11-14
Johan H
e
rland
t3301: modern
i
z
e
styl
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herla
n
d
note
s
: empty no
t
e
s should be show
n
by 'git log'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan H
e
rland
built
i
n/no
t
e
s: add
-
-allow-empty, to allow storing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
Johan Herland
builtin/notes:
split create_no
t
e()
t
o
c
l
a
r
ify
a
dd vs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-12
J
o
ha
n
Herland
builtin/notes: simpli
f
y early ex
i
t cod
e
in
ad
d
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Joha
n
H
erland
builtin/note
s
: refactor n
o
te
f
ile path into struct
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
b
u
i
l
tin
/
not
e
s
:
i
m
prove
namin
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
t33
0
1
:
verify that 'git n
o
te
s
'
removes empt
y
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
builtin/notes: fix prema
t
ur
e
fai
l
ure w
h
en t
r
ying to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-04-19
J
o
han H
e
rla
n
d
Git 2
.
0: gi
t
svn: Set def
a
ult --pre
f
ix='origin/' if
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2014-02-20
Johan Herland
no
t
es:
d
i
s
allow
r
eusing n
o
n-blo
b
as a note obje
c
t
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-28
Joh
a
n He
r
l
a
nd
sha1_
f
i
l
e
.
c:c
r
eate
_
tmpfile(): F
i
x race when
creating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
Johan Her
l
and
git-svn: Warn a
b
o
u
t changing default fo
r
--prefix in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-10-12
J
o
han H
e
rland
Doc
u
menta
t
io
n
/git-svn:
Pro
m
ote t
h
e use o
f
--prefix
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-24
J
o
han Her
l
an
d
sample
p
re-co
m
mit hook
:
use --b
o
o
l
when ret
r
ieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Joha
n
He
r
land
t320
0
:
A
d
d
test demonstrating minor
regressio
n
in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herl
a
nd
Refer to
b
r
anch
.
<
n
ame>
.
remote/merge when documen
t
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t3200: Mi
n
or fix when prep
a
ring
f
or track
i
ng f
a
i
l
u
re
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
J
o
han
Herland
t2024: Fix &
&
-ch
a
i
nin
g
a
nd a
c
ouple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
M
ove crea
t
e_notes_
c
o
m
mi
t
() f
r
o
m
not
e
s
-
me
r
ge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Her
l
an
d
Mov
e
copy_note
_
for_rewrite + friends from bu
i
lt
i
n/not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
ohan He
r
la
n
d
fin
i
sh_copy
_
notes_for_rewrite(
)
: Let caller
p
rovide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
and
glossary: Updat
e
and rephrase the defini
t
ion o
f
a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an
H
er
l
and
branch
.
c: Vali
d
ate tracking
b
ra
n
ches
w
ith refs
p
ecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han He
r
land
t9114
.
2:
D
on'
t
u
s
e
--
t
rack
o
ptio
n
a
g
a
i
nst "s
v
n-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan H
e
r
l
a
n
d
t7
2
01
.
24: Add refspec to keep --tr
a
ck
w
orking
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
t3200
.
39: trac
k
ing setup
should fail if there is
n
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Her
l
and
ch
e
c
kout: Use remot
e
refspecs when DWIM
m
ing tr
a
cking
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han Herland
t2024: Show fail
u
re to
u
s
e refspec when DWIMming
r
emote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t
2
024: A
d
d tests verify
i
n
g
current DWIM behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git symbolic-ref
--de
l
ete $symr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an He
r
land
F
i
x
f
a
ilure to delete a packe
d
ref through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herland
t1400-update
-
re
f
:
Add test verifying bug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
ohan
H
e
r
l
and
not
e
s-me
r
g
e: Don't r
e
move
.
git/NO
T
ES_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: us
e
opendir/rea
d
dir i
n
s
t
ead of using r
e
ad_
d
irec
.
.
.
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: il
l
ustra
t
e
failure to "notes merg
e
--commit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fas
t
-
import
:
F
i
x incor
r
e
ct fanout l
e
vel when modify
i
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Add
2
nd testcas
e
exposing bugs in f
a
s
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
t9301: Fix
t
e
s
tcase covering up
a bug in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Her
l
a
n
d
t5400: F
i
x a coup
l
e of typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
Mark
d
irs
t
at error messages
for trans
l
a
t
ion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve error ha
n
dli
n
g
when parsi
n
g
d
i
rst
a
t par
a
meters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
New -
-
dirstat
=
lines mo
d
e, doing dirstat analysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Allow specifying --dirstat
c
ut-off
p
ercentage
as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herlan
d
Ad
d
config
v
ari
a
ble for specif
y
i
ng default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refacto
r
--d
i
rst
a
t parsing;
deprecate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herlan
d
Ma
k
e
-
-
dirstat=0 output directories that cont
r
i
bute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Ad
d
sever
a
l testcases for --dirs
t
a
t
and friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
an Herla
n
d
-
-dirstat
:
I
n case o
f
ren
a
m
es, use target fi
l
en
a
me
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --di
r
stat not to
c
ompletely ig
n
ore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
--dirstat-by-fil
e
: Make it faster and mo
r
e correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
--dirstat
:
Describe non-obvious differen
c
es relat
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git not
e
s
a
dd" more user-friend
l
y when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Joha
n
Herland
l
og/pretty
-
options:
Do
c
ument --[no-]notes an
d
dep
r
ecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
oh
a
n H
e
rland
b
r
anch/checkou
t
--tr
a
ck:
Ensure that upstrea
m
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
d
efault
:
Rename 't
r
acking' to 'upstrea
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
Provide 'git mer
g
e --abor
t
' as a s
y
no
n
y
m to 'git r
e
set
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
c
m
d
_
merge(): Parse
options
be
f
o
re check
i
n
g
MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
P
ro
v
i
d
e 'git notes
get-ref' to e
a
sily retrieve
c
urre
n
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
note
s
mer
g
e: Add t
e
stcases for mer
g
ing
n
o
t
es tr
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git not
e
s merge: Add
a
nother aut
o
-
resolving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
gi
t
notes me
r
ge: --com
m
it should
f
ail
i
f
u
nderly
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
H
e
rla
n
d
gi
t
n
o
tes mer
g
e: List conflicting notes
in notes
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes merge
:
Manual conflict re
s
o
l
ution,
p
ar
t
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git n
o
t
e
s
merge: Man
u
al conflict resolutio
n
, part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herl
a
nd
Documentation:
Prel
i
minary docs on '
g
i
t
n
ote
s
merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
Add aut
o
matic co
n
flict resolve
r
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git
n
otes m
e
rge: Handle
r
eal, non-c
o
nflictin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n
H
erlan
d
builtin/not
e
s
.
c: Refactor creation of notes
c
ommits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herlan
d
git not
e
s
merg
e
:
Initial implementation handl
i
ng trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
builtin
/
no
t
e
s
.
c: Spli
t
notes ref DWIMmery into a
s
eparate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
notes
.
c
: Use tw
o
newlines (instead of one) wh
e
n
c
oncatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(t
r
ivial) t3303: I
n
dent w
i
th tabs instea
d
of
spac
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c:
P
ropagate
c
ombine
_
notes_
f
n return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
h/c:
Allow combine_notes functi
o
ns
to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
c: Reorder function
s
in prepar
a
tio
n
f
o
r next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
h:
Make
de
f
ault
_
notes_ref(
)
available in
n
ote
s
A
P
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
(tr
i
vial) n
o
tes
.
h
:
Minor documenta
t
i
on fixes to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
c: Hexify SH
A
1
i
n die() message from
init
_
no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
Herland
n
o
tes: D
o
n't c
r
eate (emp
t
y) co
m
mit w
h
en remov
i
ng non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Enable custom sche
m
es for colu
m
n color
s
in t
h
e graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_
n
ex
t
_line()
available in
t
h
e g
r
a
ph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
e
rlan
d
re
v
is
i
on: Turn off history simp
l
ification in --anc
e
str
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
revision: Fix typo in -
-
ancestry-pa
t
h erro
r
me
s
s
age
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
erland
D
o
cument
a
tion/
r
ev-list-options
.
txt
:
Explain --
a
n
cest
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herl
a
nd
Documentation/rev-list-opt
i
ons
.
t
x
t: Fix missing
l
ine
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
an Herl
a
nd
d
iff
.
c: Ensure
"
i
ndex $f
r
om
.
.
$
t
o" line contai
n
s
u
nam
b
iguo
u
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan
H
e
rland
bu
i
lti
n
-
n
otes: Mi
n
or (
m
o
s
tly parse_o
p
ti
o
ns-rel
a
te
d
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodul
e
summa
r
y: Do
n
't ba
r
f when i
n
voked in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
built
i
n-not
e
s: Ad
d
"copy" subcommand for
copyi
n
g notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Mis
c
.
refacto
r
ing of argc and exi
t
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
built
i
n-notes: Add -c
/
-C op
t
ions for reus
i
ng
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
bui
l
tin-notes:
Refactor
h
a
ndling
of -
F
option to allo
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-notes: Deprecate the -
m
/
-
F opti
o
ns for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herla
n
d
bui
l
t
i
n-notes: Add
"append
"
sub
c
ommand for ap
p
ending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
builtin-not
e
s:
A
d
d
"add
"
s
u
bcom
m
and for
adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add --message/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-notes: Add "list" subcom
m
and fo
r
l
isting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Documentation: Generalize git-notes doc
s
to
'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "prune" su
b
c
o
m
mand for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next