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
Merge branch 'wtk/submodule-doc-fixup'
2012-10-21
Johan He
r
land
git s
y
m
bolic-ref --delete
$
s
ymr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
H
erland
notes
-
mer
g
e: Don'
t
remove
.
git/N
O
TE
S
_ME
R
G
E
_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herland
notes-
m
erge: use opendir/readdir i
n
stead of using read_
d
irec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herland
t3310
:
illustrate fai
l
ure to
"
notes merg
e
--c
o
m
m
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
fast-import:
Fi
x
incorrec
t
fanout level when
m
odifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
t93
0
1:
A
dd 2n
d
t
estc
a
se expos
i
ng
bugs in fa
s
t-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
a
n Herla
n
d
t9301: Fix testc
a
se cov
e
ring up a bug in fast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t
5
400: Fix a couple
o
f
typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Mark dirst
a
t
e
rror messa
g
es for translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han H
e
rland
Improve erro
r
h
andling
w
h
en pa
r
sing
dirstat parameter
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
New --dirstat
=
lines
m
ode, doing dir
s
tat a
n
a
lysis
b
ased
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow spec
i
f
y
ing -
-
dirstat cut
-
of
f
p
er
c
enta
g
e as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Add
c
o
nfig variable f
o
r speci
f
ying default
-
-dir
s
tat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herla
n
d
Refactor --dirstat pars
i
n
g; deprecate -
-
c
umulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
M
ake --dirsta
t
=0 output
dir
e
c
t
o
ries th
a
t contri
b
ute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herlan
d
Add several t
e
st
c
ases
f
or --d
i
rs
t
at and f
r
i
e
nds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan H
e
rl
a
nd
--dir
s
tat:
In case of renames,
u
se t
a
rget
f
ilename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
e
r
l
and
Teach --dirstat not to completely
ignore rearranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n
Herland
-
-dirstat-by-file:
M
a
ke it faster an
d
mo
r
e correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herl
a
nd
--dirstat: Describe no
n
-
obvio
u
s
d
i
fferences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan H
e
rland
Make "git
n
ote
s
add" more u
s
e
r-f
r
iendly w
h
en there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
lo
g
/pretty-
o
ptions: Document --[no-
]
notes and d
e
p
recate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Joh
a
n
Herland
br
a
nc
h
/checkout --
t
ra
c
k: E
n
su
r
e that upstream b
r
an
c
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
def
a
ult: Rename 'tra
c
ki
n
g' to
'
upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
land
Provide 'git
m
e
r
ge --abort' as
a synonym to 'git re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
nd
c
md_merg
e
(): P
a
rse
options before chec
k
ing MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Pr
o
vide
'
git n
o
t
e
s get-ref' to easily retrie
v
e c
u
rrent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes me
r
ge:
Add te
s
tcases f
o
r
merging
n
otes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t
n
otes merge: Add another a
u
to-resolving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan H
e
rland
git notes m
e
r
g
e: --commit
s
houl
d
fa
i
l if
u
nderlying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge
:
List conf
l
icti
n
g notes in notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
M
anual confli
c
t res
o
lution, part
2
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
land
gi
t
notes merg
e
: Man
u
a
l
c
onf
l
ict re
s
olution, part 1/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oha
n
H
erland
Doc
u
mentation: Preliminary
d
o
c
s on
'
g
it no
t
es merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git not
e
s m
e
r
g
e: Add automatic conf
l
ic
t
res
o
lvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
m
e
rge: Handle real,
n
on
-
conflicting note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Her
l
and
builtin/not
e
s
.
c:
Refactor creation of notes commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes me
r
ge: Initia
l
implementatio
n
handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/
n
ot
e
s
.
c: Split n
o
tes ref DWIMmery int
o
a
s
eparate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
note
s
.
c: Use two newlin
e
s (instead
o
f one)
w
hen
concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
(trivial) t3303: Indent
w
ith tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
notes
.
h/
c
: Propagate combine_notes_fn return va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erla
n
d
n
otes
.
h
/
c: Allow com
b
ine_notes function
s
t
o
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
otes
.
c: Re
o
rder functions in
prepa
r
ation for n
e
xt
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
no
t
es
.
h:
M
a
ke
d
efault_notes
_
ref()
availa
b
le in notes API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rland
(trivial)
notes
.
h: Mino
r
docum
e
ntation fixes to copy_no
t
e
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
n
o
tes
.
c: Hex
i
f
y
S
H
A1
i
n die
(
)
message from init_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Joh
a
n
Herland
notes
:
D
o
n't create (empty) commit when removing n
o
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable
custom sc
h
emes
for co
l
um
n
col
o
rs i
n
the
graph
A
PI
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Her
l
and
M
a
k
e graph
_
next_line() av
a
ilable in the graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erland
revision: Turn
of
f
h
i
stor
y
simp
l
ification in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herl
a
n
d
revision: Fix typo in --a
n
ces
t
r
y-path erro
r
mess
a
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
a
n
d
Do
c
u
m
entation/
r
ev-list
-
options
.
txt: Explain --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
an Herla
n
d
Documentat
i
on/rev-list-optio
n
s
.
txt: Fix
missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan He
r
land
diff
.
c:
E
nsure "index $from
.
.
$to" line contains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han Herla
n
d
builtin-notes: Minor (mostly parse_o
p
tions
-
related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Joha
n
Herl
a
nd
submodule summary: Don't
b
arf when
i
nvo
k
ed in an em
p
ty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-note
s
:
A
dd "cop
y
" subcomman
d
for
c
opying
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
nd
b
u
iltin-notes: Mis
c
.
refactor
i
ng of argc an
d
exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
builtin-note
s
:
Add -c/-C o
p
tions for reusin
g
n
o
tes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: Refactor ha
n
dli
n
g of -F opt
i
on to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bu
i
lti
n
-note
s
: Deprec
a
te th
e
-
m
/-F opt
i
o
ns f
o
r "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
b
u
i
ltin-notes: Ad
d
"appen
d
" subcommand fo
r
app
e
n
ding
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
a
nd
b
u
iltin-notes: Add "add" subcomman
d
for adding
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
buil
t
i
n
-
notes: Add --mes
s
age/--file aliases for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: Add "list"
s
ubcom
m
and for list
i
ng n
o
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Documentation:
G
eneralize git
-
no
t
es do
c
s to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
builtin-notes: Add "p
r
u
n
e" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herlan
d
Notes AP
I
:
prune_notes(): Prune notes th
a
t belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Ve
r
i
f
y that removing notes tri
g
gers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
bui
l
tin-notes: Add "remove"
s
ubcommand for removi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Te
a
ch bu
i
ltin-
n
otes to remov
e
empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Tea
c
h not
e
s code
t
o
p
r
operly prese
r
ve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305:
V
e
r
ify t
h
a
t adding many
notes w
i
th
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3301: Verify successful a
n
n
o
tation
o
f non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-
i
f
y
git-not
e
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor
notes concatenation into a
f
lexi
b
l
e
i
n
te
r
fac
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API
:
Allow
multip
l
e concurrent note
s
t
rees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herland
No
t
es
A
P
I
: write_notes_t
r
ee():
Store
t
he notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
N
otes API: for_each_n
o
t
e(): Traverse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes A
P
I
:
get_note
(
): Return t
h
e note
annotating t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: rem
o
ve
_
n
o
t
e
(): Remov
e
note
o
b
j
ects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Not
e
s API: add_
n
ote(): Add note objects to the intern
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
Not
e
s
API: init_notes():
I
nitialize the
n
ot
e
s tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Add te
s
ts for checking correct h
a
ndling
of $GI
T
_NOTES_RE
F
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rlan
d
Notes API:
g
et_co
m
mit_notes() -> format_note
(
) + remo
v
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
Minor cosmetic fixes to
n
ote
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joh
a
n Herl
a
nd
bui
l
tin-co
n
fig:
Fix crash when using "-f <
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erl
a
nd
Add more testcases to test fast-import of no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Jo
h
a
n
He
r
la
n
d
Rename t9301 to t93
5
0, to make ro
o
m for more fast
-
im
p
ort
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
o
h
a
n Herlan
d
fast
-
import: Pro
p
er notes tree manipul
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Her
l
a
nd
Fix crasher on
e
ncounter
i
ng SH
A
1-like non-note in n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joha
n
Herland
Basic
b
uild
infr
a
struc
t
u
r
e
for Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herlan
d
A
d
d selftes
t
s
verifying con
c
at
e
nation of
multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an
Her
l
and
Refac
t
or notes
cod
e
to concaten
a
te
m
ultiple n
o
tes annotat
i
ng
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
He
r
land
Ad
d
selftests v
e
rify
i
ng that we can pars
e
notes t
r
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach
t
he notes l
o
okup code to par
s
e
notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
and
Teach no
t
es co
d
e to free its internal data
s
tructures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
A
dd fla
g
s to get_commit_notes() to contr
o
l
th
e
format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t3
3
02-no
t
e
s
-index-ex
p
ens
i
v
e
: Sp
e
ed up create_re
p
o()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next