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
mv: Fix spurious warning when moving a file in presence of submodules
2013-09-24
Johan Her
l
and
sample
p
re-commit
h
o
o
k
: use --bool when
r
e
trieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
l
a
n
d
t3200: Add t
e
st demonstrating minor regress
i
on in 41c21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Her
l
and
Refe
r
to b
r
anch
.
<name>
.
r
e
mote/merge when docum
e
nting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan Her
l
and
t3
2
00: Minor fix when preparing
for
trackin
g
f
a
ilure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
an Herland
t2024: F
i
x &&-chaining
a
nd a co
u
ple
of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
Move creat
e
_
n
ote
s
_commit()
from note
s
-
m
erge
.
c into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan H
e
rland
Move copy_
n
ot
e
_for_
r
e
w
rite + friends
fro
m
builtin/notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
finish_copy
_
n
otes_for_rewrite(): Let caller provide
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herlan
d
glossary:
U
pdate and rephrase
the d
e
f
i
nition of a r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan He
r
l
and
branc
h
.
c: Valid
a
te tracking
b
ranches
with refspec
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herl
a
nd
t
9114
.
2: Don't use -
-
track
opti
o
n against "s
v
n-remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erla
n
d
t7201
.
24: Add r
e
fspec to
k
eep -
-
t
r
ack working
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t320
0
.
39
:
t
ra
c
king set
u
p
shou
l
d
fail if
t
here is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
che
c
kout: Use rem
o
te
refspecs when DW
I
M
min
g
tracki
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
o
ha
n
Herl
a
n
d
t
2
0
2
4:
S
how
failur
e
to use refspe
c
w
hen
DWIMmi
n
g remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t202
4
: Add t
e
sts
verifying cu
r
r
e
nt DWI
M
behavior of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Jo
h
an H
e
rland
g
it
s
y
m
b
o
lic-ref --delete $symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herl
a
nd
Fi
x
failure to del
e
te a
packe
d
r
e
f
th
r
ough a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erland
t
1
400-update-
r
ef: Add test verifying bug with
s
ymrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge: Don't r
e
move
.
git/NOTES
_
M
E
RG
E
_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an Herland
not
e
s-merge: use opendir/
r
e
a
ddir i
n
stead of using re
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
Joh
a
n Her
l
and
t3310: il
l
u
strate failure
t
o
"
n
otes me
r
ge
-
-com
m
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herla
n
d
fas
t
-import: Fix incorre
c
t f
a
nout leve
l
when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t
9
301: Add 2nd testc
a
se exposi
n
g b
u
g
s in f
a
st-imp
o
rt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix test
c
ase cov
e
ri
n
g
up a bug in fast
-
impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an
H
erland
t5400: Fix a
cou
p
le
o
f
typo
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rland
Mark dirstat
e
rro
r
message
s
for trans
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herla
n
d
Improve erro
r
handling whe
n
parsing dirst
a
t parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan H
e
rla
n
d
N
e
w --dir
s
tat=li
n
es mode, doing dirstat analysis
b
ased
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
A
llow s
p
e
ci
f
y
ing
--d
i
rstat c
u
t
-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
e
rland
A
dd config
va
r
ia
b
le for specifying default --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Refac
t
or --dirstat parsing; deprecate
--cumul
a
tive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Make --dirstat=0
output directories that
contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan H
e
rland
Add
s
everal
testcases
f
or --dirstat a
n
d friends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n He
r
land
--dirstat:
In case of
ren
a
me
s
, use targ
e
t
filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
Tea
c
h --dirstat not
to
com
p
l
etely ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
di
r
stat-by-file:
Make i
t
faster and more
c
o
rrect
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
-
-
d
i
rsta
t
: Descr
i
be no
n
-
o
b
vious
d
ifference
s
relati
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herl
a
n
d
Make "git not
e
s add" more u
s
e
r
-friendly when th
e
re
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan He
r
land
log/pretty-options: Do
c
ume
n
t
--[no-]notes and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
b
r
anch
/
c
h
eck
o
u
t --tra
c
k: Ensur
e
that upstream
b
ranch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
ohan Her
l
and
push
.
defa
u
lt:
R
ename 'trackin
g
' to
'
u
p
stream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herlan
d
Provide 'git me
r
ge --a
b
ort' as a
syno
n
ym to 'git re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
cmd_m
e
rge(): Pa
r
se options
b
efore che
c
king MERG
E
_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
Pro
v
i
de 'git no
t
e
s
g
e
t-r
e
f'
to
e
asily retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git note
s
me
r
ge: Add testc
a
s
es for
merging n
o
tes tr
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add a
n
other auto-
r
esolvin
g
strat
e
gy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: --commit should fail if unde
r
lying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herla
n
d
g
it notes merge:
L
ist conflicting note
s
in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
git not
e
s merge: Manual conflic
t
reso
l
utio
n
,
par
t
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
git n
o
te
s
m
e
rge:
M
an
u
al conflict reso
l
ution, part
1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation:
P
r
e
l
i
m
inar
y
do
c
s on 'git not
e
s merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git note
s
m
er
g
e: Add automat
i
c
conflict
r
esolver
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
g
i
t n
o
tes merge: Handle real, no
n
-conflictin
g
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
builtin/notes
.
c
: Re
f
a
ctor
c
reat
i
on of notes commit
s
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herla
n
d
gi
t
notes me
r
ge: Initial implementatio
n
handling
trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
builti
n
/notes
.
c: Split
n
otes ref DW
I
Mmery into
a
separa
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rlan
d
note
s
.
c: Use two new
l
ines (instead of
one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3303: Indent with t
a
bs inste
a
d of sp
a
c
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
note
s
.
h/c: Propagate
c
omb
i
ne_
n
otes_fn
r
eturn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n Herland
n
ot
e
s
.
h
/
c
:
Allow combine_notes fu
n
ctions
to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
He
r
land
no
t
e
s
.
c: Reo
r
der fu
n
ctions in
p
reparati
o
n for
n
ext
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
no
t
es
.
h: Ma
k
e
default_notes_ref() available in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivia
l
)
note
s
.
h: Minor documentatio
n
fixes
t
o copy
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
notes
.
c
: Hexi
f
y SHA1 in die() me
s
sag
e
f
r
om
i
nit_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan H
e
rland
notes: Don't create (
e
mpty) commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
H
erland
Enable cus
t
om schemes for c
o
lu
m
n colors in the gra
p
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
J
o
han H
e
r
l
and
Make graph_next_line() avail
a
ble
i
n the gra
p
h
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an
Herla
n
d
revisio
n
: Turn
o
f
f
hist
o
ry simplification
in --ancestr
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herl
a
nd
revision
:
Fix typo in --ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documen
t
ation/rev-list-options
.
txt:
E
xplain --a
n
cestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
Docum
e
nta
t
ion/r
e
v-list
-
op
t
ion
s
.
txt
:
Fix
m
issing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herl
a
nd
diff
.
c: Ensure "in
d
ex $from
.
.
$to" line contains un
a
mbiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herlan
d
buil
t
in-notes:
M
inor (m
o
stly p
a
rse_options-
r
elated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
ohan Herland
submodul
e
s
u
m
mary: D
o
n't barf
w
hen in
v
oke
d
in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes:
Add "copy" subc
o
mmand fo
r
c
opying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bu
i
ltin-n
o
tes
:
Mi
s
c
.
r
efactoring of
argc
and
e
xi
t
value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han H
e
rland
builtin-
n
otes: Ad
d
-
c/-C
options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Her
l
and
bui
l
tin
-
notes: Refactor handling of -F option to
allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
H
erland
bui
l
tin-notes: Deprecate th
e
-m/-F opt
i
ons for "gi
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s: Add "append" subcommand
f
o
r
ap
p
ending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an He
r
land
bu
i
ltin-n
o
tes: Ad
d
"add" subcommand
for a
d
din
g
note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
b
u
ilt
i
n-notes: Add -
-
messa
g
e/--f
i
le al
i
ases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
r
land
builtin-notes
:
A
dd "
l
ist"
s
ubc
o
mmand for li
s
t
ing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Documentati
o
n: Generali
z
e gi
t
-notes docs to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add "prun
e
" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API: prune_notes(
)
:
Prun
e
notes
t
h
at belon
g
to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t
330
5
:
V
e
ri
f
y that removing
n
o
tes triggers automat
i
c
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builti
n
-notes: Add "remov
e
" subcommand for remov
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Teach b
u
il
t
in-n
o
tes t
o
remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
T
e
ach no
t
es code to pro
p
erly preserve non-
n
otes
in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
l
and
t3305:
Ve
r
ify
th
a
t adding many note
s
with git-not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
t3301: Verify
s
uccessfu
l
annotati
o
n o
f
n
o
n-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
Builtin-ify gi
t
-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herland
R
e
factor notes
c
o
ncatenation into a flex
i
b
l
e interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
N
o
tes A
P
I: Allow multiple co
n
curr
e
nt note
s
trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
tes
API:
w
rite_notes_tree
(
)
:
St
o
re
the notes
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
No
t
es
A
PI: for_e
a
c
h
_note():
T
raver
s
e
t
h
e entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: get_note():
R
eturn the n
o
te anno
t
ati
n
g the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
N
o
te
s
AP
I
: remove_note():
Rem
o
v
e
note objects
f
rom
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next