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
t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
2012-10-21
J
ohan
H
e
r
land
t
1
4
0
0-update-r
e
f: Add tes
t
verifying bug with s
y
m
r
efs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
o
h
an Herl
a
nd
notes-merge
:
Don't r
e
move
.
git/
N
OTES_MERGE_WORKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-me
r
ge: use opendir/re
a
ddir
i
n
s
t
ead
of using read
_
direc
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
Herland
t
3
310: illus
t
rate fail
u
re to
"
not
e
s
m
erge --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herlan
d
f
ast-import
:
Fix
inco
r
rec
t
fanout level when mo
d
ifyi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t
93
0
1
:
Add 2nd testcase exposing bug
s
i
n
fast-impor
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
t9301: Fix testcase coveri
n
g up a bug in fast-impor
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400:
Fix a couple o
f
t
ypos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Mark dirstat er
r
or messages for tran
s
l
a
t
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
I
m
p
rov
e
error han
d
ling when parsi
n
g d
i
rstat param
e
ters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan He
r
land
New --dirstat=line
s
mode, doing dirstat analysis ba
s
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herl
a
nd
Allow specifying --dirstat cut-off percenta
g
e as
a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
A
d
d
config variable fo
r
specifyi
n
g
defau
l
t --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n He
r
land
Refactor --dirstat p
a
rsing; dep
r
ecate
--c
u
mul
a
t
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n
Herl
a
nd
Make
-
-d
i
rstat=0 output direct
o
ries that cont
r
i
b
ute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add s
e
veral
testcas
e
s for --dirstat an
d
friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han Herland
--dirstat
:
In
case of
r
enames,
u
se
t
a
r
ge
t
filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herla
n
d
Teach --dirstat
n
ot
t
o com
p
lete
l
y
ignore rea
r
ran
g
ed
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herl
a
n
d
--d
i
rstat-
b
y
-file: Make it faster
a
n
d more correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n H
e
r
l
and
--dirstat: Des
c
ribe
n
on-obv
i
ou
s
differences relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git
n
o
t
es add
"
more user-frien
d
ly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
J
ohan Herland
log/pretty-opt
i
o
n
s: Documen
t
--[no-]notes
a
nd depreca
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/che
c
ko
u
t --
t
rack: Ensure that upst
r
eam
b
r
anch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
p
u
s
h
.
defa
u
lt: Rename 'tracki
n
g' to 'upstre
a
m'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Her
l
and
Provide 'g
i
t merge --abort'
a
s a synonym to 'g
i
t r
e
set
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herlan
d
cmd_merge(): Parse opti
o
ns be
f
o
r
e checking
M
ERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
Provid
e
'git notes get-ref' to
e
a
sily retrie
v
e current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n
H
erla
n
d
gi
t
notes m
e
rge:
Add testc
a
ses f
o
r merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
Herland
git
notes merge: Add another auto-res
o
l
v
ing s
t
rat
e
g
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t notes mer
g
e:
--c
o
mmit should fail i
f
underlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git
notes merg
e
: L
i
st confli
c
ting n
o
tes
i
n
n
o
tes
m
erge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merge: Ma
n
ual
con
f
lict resolut
i
on
,
part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
gi
t
notes me
r
ge: Man
u
al co
n
flict resolu
t
ion, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation: Prelimi
n
a
r
y
docs on 'git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes m
e
rge: Add auto
m
a
t
ic c
o
nflict re
s
olvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git n
o
te
s
m
e
rg
e
: Hand
l
e real,
non-conflicti
n
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
builtin/
n
o
tes
.
c
:
Refactor c
r
e
a
t
i
o
n
o
f
n
otes
c
ommit
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: I
n
itial impl
e
m
e
ntation
h
a
ndlin
g
t
rivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herla
n
d
builtin/
n
o
t
es
.
c: Split note
s
ref DWIMm
e
ry into a separ
a
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
c: Use
two newlines (instead of one) wh
e
n c
o
ncatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(
t
rivial) t3303: In
d
ent with tabs instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herlan
d
not
e
s
.
h/c: Propagate combine_notes_fn
r
eturn value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow
c
ombin
e
_notes functio
n
s
to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rl
a
nd
note
s
.
c: Reorder
f
u
n
ctions
i
n prepara
t
i
on
for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan He
r
land
note
s
.
h
: Ma
k
e default
_
no
t
e
s_re
f
() a
v
ail
a
ble i
n
note
s
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan He
r
land
(trivial) no
t
es
.
h: Minor document
a
tion f
i
xes to copy_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
no
t
es
.
c: Hexify SHA1 in die() message fro
m
in
i
t_note
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan
H
erl
a
nd
notes: Don't create (empty) commit when r
e
moving
non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an Herland
E
n
a
b
le custom
scheme
s
for column co
l
ors in the graph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
a
n
H
erland
Make graph_next_line() available in the
g
raph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan He
r
lan
d
revisi
o
n: Turn off history simp
l
ification in --
a
ncestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Jo
h
a
n Herland
revision: Fix typo in --ancestry-path error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/
r
ev-list-
o
ptions
.
tx
t
: Explain --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
H
erlan
d
Doc
u
mentation/rev-list-options
.
txt: Fix missi
n
g line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Joh
a
n Herland
diff
.
c: Ensure "index $from
.
.
$t
o
" line con
t
ains unambiguo
u
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han Herland
builtin-
n
o
te
s
: Minor (m
o
stly parse_options-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Joh
a
n Herland
su
b
m
o
dule s
u
mmary: Don'
t
barf whe
n
invoked
in an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "
c
opy" sub
c
omm
a
nd fo
r
copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin-notes: Misc
.
refactoring of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-
n
otes:
A
dd -c/-C optio
n
s
f
or reusing notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Ref
a
ctor handling
of -F
opt
i
o
n t
o
allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes: Deprecate
the -m/-F options f
o
r "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-no
t
es:
A
dd "app
e
n
d" subcommand for appendin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes: A
d
d "add" subc
o
mmand f
o
r add
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add
--mess
a
ge/-
-
file alias
e
s for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
ilt
i
n-note
s
: Add
"
list" subc
o
mman
d
for
l
i
s
tin
g
note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Documen
t
ation: Generalize
git-notes d
o
c
s
t
o 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
a
n
d
builtin-notes: Add "prune" subcomman
d
for remo
v
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
Notes API: prune_n
o
tes(
)
: Pr
u
ne n
o
tes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
t3
3
05: Verify tha
t
removing
n
o
t
es t
r
ig
g
e
r
s auto
m
at
i
c
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
b
uilt
i
n-note
s
:
Add "remove"
subcommand
f
o
r removi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
H
e
rlan
d
Teach
b
u
iltin-not
e
s to remo
v
e e
m
pty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
T
each notes code to properly preserv
e
n
o
n-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
05: Veri
f
y
that addi
n
g
m
any no
t
es
w
ith
g
i
t
-note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t330
1
: Verify success
f
ul
annotation of non
-
commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herlan
d
Builtin-
i
f
y
gi
t
-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
Refactor notes concatenation
into a flexible
i
n
terface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
N
o
tes API: Allow m
u
ltiple c
o
ncurr
e
n
t
n
otes
t
r
ees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: write_notes
_
t
r
ee(): S
t
ore the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
n
d
No
t
es API: f
o
r
_
e
ac
h
_note(
)
: Tr
a
verse the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
No
t
es API: g
e
t_not
e
(): R
e
turn the no
t
e annotating the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Note
s
API: r
e
mov
e
_note
(
): Remove note o
b
jects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
r
land
Notes API: ad
d
_note():
Add note
o
bjects to the
internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
an
d
N
ot
e
s API
:
init_notes
(
): Initialize
t
h
e notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Add tests for
c
h
ecking
co
r
rect handling
of
$
GIT_NOTES_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
Notes A
P
I: get_commit_n
o
tes() -> f
o
rmat_note() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
M
i
no
r
cosmetic fixe
s
t
o
notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herl
a
nd
builtin
-
confi
g
: Fix crash when using
"-f <rela
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
o
h
a
n
Her
l
and
Add m
o
re
test
c
ase
s
to test fast-i
m
p
ort of note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t9301 to t9350
,
to make room for more
fast-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-
i
mport:
P
roper
n
o
tes
tree m
a
nipu
l
ation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix crasher on e
n
countering SHA1-like non-note in notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Basic
b
u
ild
i
n
f
r
astructure for
Python script
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan H
e
rland
Add selft
e
sts
verifying
concatenation of multi
p
le note
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan
H
erland
R
efac
t
or no
t
es code
to
c
oncatenate multiple not
e
s an
n
otat
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
r
l
and
A
dd selft
e
sts
veri
f
ying that we can pa
r
se
n
otes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
e
rland
Teach the notes l
o
okup co
d
e
t
o
parse notes tr
e
es with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an Her
l
a
nd
Teach n
o
tes co
d
e
t
o free its i
n
ternal data structur
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Jo
h
an Herland
A
dd f
l
ag
s
to get_co
m
mit_not
e
s() to con
t
rol the
format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t330
2
-
notes-
i
ndex-expensive: Speed
u
p
c
re
a
te_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next