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: add --allow-empty, to allow storing empty notes
2014-11-12
Johan Herla
n
d
builtin/notes: a
d
d -
-
allow-em
p
ty
,
to allow storing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-12
Johan
H
erland
builtin/n
o
tes: s
p
lit create
_
no
t
e
(
) to clarify add vs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-12
J
ohan Herland
builtin/notes:
s
implify early ex
i
t co
d
e
in add()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
J
ohan Herlan
d
builtin/notes
:
refacto
r
note file path
i
nto struc
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
b
u
i
l
t
i
n/notes:
i
mprove n
a
ming
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
J
o
han
H
erland
t3
3
01: verify that
'git notes
'
r
em
o
ves empty n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-11-10
Johan Herland
builtin/notes
:
f
ix premature failure
whe
n
t
ryi
n
g to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-04-19
Johan
H
erland
Git 2
.
0: git svn: Set default --prefix='origin/' if
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2014-02-20
Johan
H
er
l
and
note
s
: disall
o
w re
u
si
n
g non-
b
l
o
b as
a
note object
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-28
Johan H
e
rland
sha1_file
.
c:create_tm
p
file():
F
ix
r
a
ce when creat
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Johan He
r
land
g
i
t-svn: Wa
r
n about chang
i
ng d
e
fa
u
lt for --prefix
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
J
o
han Herland
Document
a
tion/git-svn: Promote the use of --
p
refix
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-24
Johan Herlan
d
s
a
m
ple pre-commit hook: use
-
-bool
when retriev
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
t32
0
0: Add test demonst
r
ating minor regress
i
on in 41c21f2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herland
Refer
t
o branch
.
<name>
.
r
e
mo
t
e
/
m
e
rg
e
when documenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herlan
d
t320
0
: Mi
n
o
r
fix when preparing
f
or tracki
n
g
f
ailure
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t2024: Fix
&&-chaini
n
g
and a
c
ouple
of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move creat
e
_notes_commi
t
() f
r
om n
o
te
s
-merge
.
c
i
nto
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
M
ove copy_note_
f
or_rewri
t
e + fri
e
nds from b
u
iltin
/
n
ot
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
f
i
nish_co
p
y_notes_for_rewrite(): Let c
a
ller provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
a
n Herlan
d
g
l
os
s
a
r
y
: Up
d
a
t
e and rep
h
rase
the
d
efinit
i
on of
a rem
o
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
oh
a
n Herland
bra
n
c
h
.
c: Validate
tra
c
k
i
ng branches
w
ith refs
p
ecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
h
an
H
e
rland
t9
1
1
4
.
2: Don't
u
se
--track
option a
g
ainst "svn-remot
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
o
han
H
erland
t7201
.
24: Add
r
e
f
spec to keep
-
-track working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herl
a
nd
t
320
0
.
39: tr
a
ck
i
n
g setup should fail if th
e
re i
s
no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
land
checkout: U
s
e remote
refspecs
w
hen DWIMming tracking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t2024: Show failure to use refspec
when
D
WIMm
i
ng remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t2024: Add te
s
ts v
e
ri
f
y
i
ng
c
urrent DWIM behavior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan H
e
rland
git symb
o
lic-ref --de
l
ete $sym
r
ef
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
Fix failure to delete a packed
r
ef throug
h
a s
y
mref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t1400-update-ref: Ad
d
test v
e
rifying bug with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rlan
d
notes-merge: Don't remove
.
git/
N
OT
E
S_MERGE_WOR
K
TREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: use op
e
n
d
ir/readdir i
n
stead of usi
n
g
r
e
a
d_direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
t
3
310: ill
u
strate f
a
ilure to "notes m
e
rge --co
m
mit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herlan
d
f
ast-i
m
por
t
: F
i
x inc
o
rrect fa
n
out level wh
e
n
m
odifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
a
n
H
erla
n
d
t9
3
01: Add 2nd test
c
as
e
exposing bugs in fast-im
p
ort
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
H
erl
a
nd
t9301: Fi
x
testcase covering
up a bug in fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t54
0
0: Fix a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Mark dirs
t
at er
r
or messages
fo
r
tra
n
sl
a
t
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Improve error
handling when pars
i
ng dirstat param
e
ters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
H
erland
New --dirs
t
a
t=lines m
o
de, doing dirstat
a
nalysis base
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Allow sp
e
cify
i
ng --dirsta
t
c
u
t
-
off percentage
as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add
c
o
nf
i
g variable for specifyi
n
g de
f
ault --d
i
rs
t
at
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Her
l
a
n
d
Refactor
-
-dir
s
tat parsing; d
e
precate
--cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan
H
erland
Mak
e
--dirstat=0 outp
u
t directories that con
t
ri
b
ute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erlan
d
A
d
d s
e
veral testcases f
o
r --dirstat and fr
i
ends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Her
l
and
-
-d
i
rstat:
In
case of renames
,
use ta
r
get
f
ile
n
a
m
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan H
e
rland
Teach --dirstat not
to complete
l
y igno
r
e rearra
n
ged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
--dir
s
tat
-
by-file: Make
i
t faster and
more c
o
rre
c
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
-
-di
r
sta
t
: De
s
c
ribe n
o
n
-
obviou
s
differences relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Joh
a
n
Herland
Make
"
git notes add" more user-
f
rien
d
ly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty-options: Document --
[
no-]n
o
tes and depre
c
ate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an Herland
branch/che
c
kout --track: En
s
u
r
e that upstre
a
m b
r
anch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herla
n
d
p
ush
.
default: Rename '
t
racking' to '
u
pst
r
eam'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge --abor
t
'
a
s a synonym to 'git
reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
cmd_
m
erge(): Parse optio
n
s before chec
k
ing M
E
R
G
E
_
HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Pr
o
v
ide '
g
it
notes get-ref' to ea
s
ily ret
r
iev
e
current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git notes m
e
rge
:
Ad
d
test
c
as
e
s for merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes merg
e
: Add a
n
o
t
h
e
r auto-
r
es
o
lving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merg
e
: --commi
t
should
f
ail if underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
git n
o
t
es merge: Lis
t
con
f
licting notes in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
gi
t
n
otes me
r
g
e: Manual conflict resolutio
n
, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
gi
t
notes merge: Manual co
n
flict resolution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
D
ocumentation: Preliminary do
c
s on 'git notes m
e
rge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git n
o
tes merge
:
Add a
u
tom
a
tic conflic
t
resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge: Handle real,
non-
c
o
nflicting notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
bui
l
tin/notes
.
c: Ref
a
ctor
creati
o
n of n
o
tes commi
t
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
g
i
t
not
e
s
merge:
I
n
itial implementatio
n
handling trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
builtin/notes
.
c: Split
n
o
t
es
re
f
DWIMme
r
y
into a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
not
e
s
.
c: Use two newlines (instead of one
)
w
h
e
n
c
oncatenati
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herlan
d
(trivial
)
t
33
0
3
:
I
n
dent with tabs instead of sp
a
ces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n Herland
note
s
.
h/c:
P
ropag
a
te combine
_
not
e
s
_
fn
r
e
t
urn v
a
lue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
t
es
.
h
/c: Allow com
b
ine_
n
o
t
es functions to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
c: Reorder functi
o
ns in
p
r
e
par
a
tion
for n
e
xt
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
H
erl
a
nd
n
o
tes
.
h
:
Make defau
l
t
_
not
e
s_ref()
available in not
e
s AP
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(tri
v
ial)
n
otes
.
h: Minor document
a
ti
o
n f
i
xes to
c
o
p
y
_n
o
tes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
n
o
tes
.
c: Hexify SHA1 in
die() message fr
o
m in
i
t
_not
e
s()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
He
r
l
and
notes: Don
'
t crea
t
e (empty) commit when removin
g
non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
nd
Enab
l
e cust
o
m s
c
h
em
e
s for colum
n
colors in the graph
A
PI
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herl
a
nd
Make g
r
aph_next
_
line() available in the graph
.
h
A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
revision: Turn of
f
history simplification
i
n
--
a
ncestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
and
revision: F
i
x typo in
-
-ancestr
y
-path error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev-list-options
.
txt:
Explain --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
oh
a
n
H
erland
Documentation/re
v
-list-options
.
t
x
t:
F
i
x
missing
line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
rla
n
d
d
i
ff
.
c: En
s
ure "index
$from
.
.
$to"
l
i
ne contains
u
namb
i
guous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
o
ha
n
H
erl
a
nd
builtin-
n
ot
e
s
:
Minor (mo
s
tly pa
r
s
e_
o
ptions-relate
d
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan
H
erland
submod
u
le summary: D
o
n't barf when invoked
i
n
a
n empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n H
e
rland
b
uiltin-n
o
tes:
A
d
d
"copy" subcomman
d
for copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Misc
.
refactoring of argc and exit va
l
ue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-
n
o
tes:
A
dd
-
c/
-
C opt
i
ons for reusin
g
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-n
o
t
e
s: Refactor handling of -F
o
ption to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builti
n
-notes:
D
eprec
a
te the -m/-
F
op
t
ions for "gi
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add "append" subcommand for ap
p
ending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
builti
n
-notes: Ad
d
"add" subcommand for
a
ddin
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
ilti
n
-n
o
tes: Add --mes
s
age/--fil
e
a
liases fo
r
-m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
built
i
n-
n
ote
s
:
A
d
d
"
list" subco
m
mand for listing note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Do
c
umen
t
ation:
Ge
n
e
raliz
e
git-
n
otes docs to 'o
b
jec
t
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bu
i
ltin-n
o
tes: A
d
d "prune" subcomm
a
nd for removin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
a
nd
N
otes
A
PI: p
r
une_notes()
:
P
rune no
t
es th
a
t b
e
l
ong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
t3305: V
e
rify that removing
n
otes tri
g
gers automati
c
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next