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
glossary: extend "detached HEAD" description
2012-10-21
Johan
Herla
n
d
F
i
x failure to d
e
l
ete a p
a
c
ked ref thro
u
gh a
symre
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
ha
n
He
r
land
t1400
-
update-ref:
A
dd tes
t
verifying bug wi
t
h symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
J
o
han Herland
note
s
-
m
e
rge: D
o
n't remove
.
gi
t
/NOT
E
S_M
E
RGE_WORKT
R
EE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Joha
n
H
e
rl
a
nd
n
o
tes
-
merge: use opendir/readdir inst
e
ad of
u
sing read_di
r
ec
.
.
.
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
t
3310: illu
s
t
rate failure to "
n
otes mer
g
e --
c
ommit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Her
l
and
f
ast
-
import: Fix inco
r
rect fanout level whe
n
modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n
H
erland
t9301: Add 2nd te
s
tca
s
e exposing bugs in
f
as
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan
He
r
land
t
9
3
0
1: Fix
t
estc
a
se cover
i
ng up a
b
ug in
fast-i
m
port
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
Her
l
and
t5400: Fix
a
coupl
e
o
f typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
M
ark di
r
s
ta
t
e
r
ro
r
messages for tran
s
lation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
land
I
m
prove err
o
r handling when parsin
g
d
irstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
N
e
w --dirstat=lines mode, doing dir
s
tat an
a
lysis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han H
e
r
l
and
Allow sp
e
cifying --dir
s
t
a
t
c
ut-off p
e
rc
e
n
t
a
g
e
a
s a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
an H
e
rland
Add c
o
nfig variable for spec
i
f
y
ing
defaul
t
--dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n
Herland
Re
f
actor
-
-dirs
t
at p
a
r
sing;
depr
e
c
a
te -
-
cumulat
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
He
r
land
Make --dirstat=0 ou
t
put directo
r
ie
s
that
c
ontribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add s
e
veral testcases for --dirstat and
f
r
iends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herl
a
nd
--dirsta
t
: In cas
e
of renames, use target f
i
lename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
Teach
-
-dir
s
ta
t
not to completely ignore r
e
arranged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
d
irsta
t
-by
-
file: Make it
f
aster and
m
ore correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describ
e
non-obvious di
f
ferences relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
M
ak
e
"g
i
t no
t
es a
d
d" mo
r
e user-f
r
ien
d
ly when
t
he
r
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan H
e
rland
log/pretty-option
s
: Document --[no-]
n
ote
s
and deprec
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
o
han H
e
rlan
d
branch/c
h
e
ckout --track: Ensure tha
t
upstrea
m
branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herlan
d
push
.
de
f
ault: Rename 'tracking' to 'up
s
t
r
eam'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
Pr
o
vide 'git merge --ab
o
rt' a
s
a
s
ynonym to
'git re
s
et
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge(): Parse op
t
ion
s
bef
o
re ch
e
cking
M
ERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide
'
git notes get-r
e
f' to easily retrieve curren
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes merg
e
: A
d
d
t
estcases for
m
erging notes
t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes
mer
g
e: Add another auto-res
o
lv
i
ng strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes merg
e
: --commit should fa
i
l i
f
unde
r
lying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes merge: List
conflict
i
n
g
notes in note
s
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
an
d
git
n
otes merge: Ma
n
ual conflict res
o
lutio
n
, par
t
2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes merge: M
a
nual confl
i
ct resolution, part
1
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Doc
u
mentat
i
on: Pre
l
iminar
y
d
ocs on
'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erl
a
n
d
g
it not
e
s merge
:
Add auto
m
atic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
a
n
d
git notes merge: Handle real, non-conflict
i
ng not
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/
n
otes
.
c: Refa
c
tor creat
i
on o
f
notes co
m
mits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
git notes m
e
rge: Initial implementation
handling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
b
uiltin/notes
.
c: Spl
i
t notes ref DWIMmery into a s
e
para
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
nd
n
o
t
es
.
c
: Use two n
e
wli
n
es (ins
t
e
a
d of one)
w
hen con
c
atenat
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(
t
riv
i
al) t3303:
I
ndent with tabs instead o
f
spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/
c
:
Pr
o
pag
a
te
combine_not
e
s_fn re
t
urn value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
n
d
notes
.
h
/c: Allow combi
n
e_notes functions to re
m
ove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
c
:
Reorder f
u
nctio
n
s in preparation for nex
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
note
s
.
h: Make de
f
ault_not
e
s_ref() availab
l
e
in notes
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
(
trivial) no
t
es
.
h: Minor
d
ocumentat
i
on fix
e
s to c
o
py
_
notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
c: Hexif
y
SHA1
i
n die() message from init_n
o
tes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
o
h
a
n
Her
l
and
notes: Don't
c
reate (empt
y
) commit when removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Joha
n
Herland
Enabl
e
c
u
s
t
om sch
e
mes
f
or col
u
m
n
c
o
lors in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herla
n
d
Make
g
r
a
ph_next_line
(
) av
a
ilab
l
e in the graph
.
h
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
revision: Turn
off history si
m
pli
f
ica
t
ion in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
revision: Fix t
y
po in --ancestry
-
path err
o
r messag
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/rev
-
l
i
st-op
t
i
o
ns
.
txt: E
x
plain --ance
s
try
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
r
lan
d
D
ocumentation/rev-list-options
.
txt:
F
ix m
i
s
sing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan H
e
rland
diff
.
c: Ensur
e
"index
$
from
.
.
$to" lin
e
contains unam
b
i
guous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
builtin-notes: Minor (mostly parse_options-
r
elated
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Jo
h
an Her
l
and
subm
o
dul
e
summ
a
ry
:
Don't barf
w
hen i
n
voked in an
empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bui
l
tin-notes: Add "
c
opy" sub
c
ommand for copying note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
and
builtin-notes: Misc
.
refact
o
rin
g
o
f argc and exi
t
val
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builti
n
-
notes: Add -c/-C options for reusing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-notes: Refac
t
or handling
of -F opti
o
n to al
l
ow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
nd
builtin-notes:
Depre
c
ate the -m/-F optio
n
s for "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herla
n
d
builtin-notes: Add "appe
n
d" subcommand for ap
p
ending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes
:
Add
"
add" subco
m
mand for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
b
uiltin-not
e
s
:
Add -
-
me
s
sage/--f
i
le aliases
f
or
-m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-not
e
s
: Add "list" subcommand for l
i
s
ting note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Docu
m
e
ntation: Gener
a
lize
g
it-notes docs to 'o
b
jects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
builtin
-
not
e
s
:
A
d
d "prune" subcommand
f
or
r
emoving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
Notes API: pru
n
e
_
n
otes():
P
rune n
o
tes that bel
o
ng to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t330
5
: Verify that removing notes triggers
a
utomatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
built
i
n-n
o
tes: Add "remove" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Her
l
and
Te
a
c
h
bui
l
tin-note
s
to remove empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Teach no
t
es c
o
de to properly
preserve
non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
t3305: V
e
rify that add
i
n
g many note
s
w
i
t
h
g
it-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
t
3
301: Ve
r
i
fy successful annotation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Builtin-ify
git-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan H
e
r
l
and
Refactor notes concatenatio
n
into a fle
x
i
b
le int
e
rface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Note
s
API: A
l
low multiple concu
r
rent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herla
n
d
Notes API: w
r
ite
_
notes_
t
ree(): Store the notes
t
ree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
API: for_each_note(): Traverse
the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes API: get_note()
:
R
e
turn t
h
e note annotating
t
h
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Herl
a
nd
Notes
API: remove_note()
:
Remove n
o
te
objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
Notes API: add_note(): Add no
t
e objects to the int
e
rna
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: init_notes(): Initia
l
ize the no
t
es t
r
ee
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herl
a
nd
Add tests fo
r
checking cor
r
e
c
t handling of $GIT_NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
N
o
t
e
s API
:
get_commit_not
e
s() -> format_note(
)
+ remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
Minor cosmetic fixes to
n
ote
s
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Johan He
r
l
a
nd
builtin-config: Fix crash whe
n
using "-f <relativ
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Her
l
a
nd
Add mor
e
testcases to t
e
st
fast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan He
r
land
Ren
a
me t9301 to t9350, to make
room for more fa
s
t
-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
J
ohan Herland
fa
s
t-im
p
ort: P
r
oper notes
tree manipul
a
tion
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herla
n
d
Fix
crasher on
e
ncounte
r
ing SHA1-like non-note in
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Joh
a
n
H
er
l
and
Basic build
infrastr
u
ctu
r
e for Python
scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add selfte
s
ts
v
er
i
fying concatenation
o
f mu
l
t
i
pl
e
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
Herland
Refactor notes code
t
o
c
o
ncatenate mu
l
tipl
e
notes a
n
notating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herland
Add sel
f
t
e
sts v
e
r
i
fying t
h
at we can
pars
e
no
t
e
s
t
r
ees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach
t
he no
t
es lookup code to pa
r
s
e
notes trees
with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Teach note
s
code to fre
e
i
t
s
internal data stru
c
t
ures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
Add flags to ge
t
_co
m
mit_notes()
t
o
contro
l
the form
a
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next