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 'maint'
2012-10-21
Johan Herland
git symbol
i
c-re
f
-
-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
d
e
lete
a pack
e
d ref through a symr
e
f
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
t14
0
0-update-ref: Add
test veri
f
yi
n
g bug with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
a
n
Herland
note
s
-merge: Don'
t
re
m
o
v
e
.
git/NOT
E
S
_MERGE_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
H
erland
notes-merge: use opendir/rea
d
dir instead of usin
g
read_direc
.
.
.
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
t3
3
1
0
:
illustr
a
t
e
f
ailure to "note
s
merge --
c
o
m
m
it
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Joh
a
n Herland
fa
s
t-import: Fi
x
incorrect fanou
t
level when modifyi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herl
a
nd
t9301: Add 2nd
t
estcase expos
i
n
g b
u
gs in
fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
t9301: Fix
te
s
tcase c
o
vering up
a bug i
n
fast-impor
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400
:
Fix a couple of ty
p
os
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Her
l
and
Mark
d
irstat error mess
a
ges fo
r
translati
o
n
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Her
l
and
Improve error ha
n
dling
w
h
e
n parsing dirs
t
at p
a
rameter
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
New --dir
s
t
a
t=l
i
nes
mode
,
doing
dirst
a
t an
a
l
y
sis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow specifying --dirstat
c
ut-
o
f
f
percenta
g
e as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Add
c
onfig var
i
a
b
le
for specifying default
-
-
dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refactor
-
-dirstat parsing;
deprecate --cumula
t
ive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
ohan Herla
n
d
Make --dirstat=0 ou
t
put directori
e
s that contribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n
Herland
Add sev
e
ra
l
testcases for --dirst
a
t and f
r
iends
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herla
n
d
-
-dir
s
tat: In ca
s
e o
f
renam
e
s,
u
s
e ta
r
ge
t
filen
a
me
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n
H
e
r
land
Teach
--dirstat
n
ot to completely ign
o
re
r
earra
n
ged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herl
a
n
d
--dirstat-by-
f
ile: Make
it faster
and mo
r
e correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dir
s
t
a
t: Describe non-obvious differences
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git notes add"
m
ore user-friendly wh
e
n there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herla
n
d
l
o
g
/
pret
t
y
-
optio
n
s: D
o
cument
--[no-]notes and deprecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
an Herland
bra
n
ch/checkout -
-
tr
a
ck: Ensure that upstream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
pus
h
.
d
efault: Rename 'tracking' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
a
nd
Pro
v
ide 'git merge
-
-
a
bor
t
' as
a syn
o
nym to 'git reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_
m
erge(): Pa
r
se o
p
t
i
ons before chec
k
i
ng MERG
E
_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
Provide 'git notes get-ref' t
o
easily retrieve cur
r
ent
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git notes merge: Add testcases for merging notes tr
e
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
er
l
and
git notes me
r
ge: Add another aut
o
-resolving strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
o
tes merge: --commit s
h
ould fail
if underlyi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
git no
t
es
m
e
r
ge: List
c
onflicting n
o
tes in n
o
t
e
s
merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git n
o
tes
m
erge: Manual
c
o
nf
l
ict r
e
so
l
ution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
git notes merge: Manual c
o
nflict
r
eso
l
u
t
ion,
p
a
rt 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
Documentati
o
n:
P
r
e
liminary docs on 'git n
o
tes me
r
g
e
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
g
it note
s
merge:
A
dd automatic conflict resolv
e
rs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rla
n
d
git notes me
r
ge: Handle real, non-conflicting note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
l
an
d
b
uiltin/notes
.
c: Refactor creation o
f
n
o
t
es commits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
g
i
t note
s
me
r
ge: Initial impleme
n
tat
i
on ha
n
dl
i
ng trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
builtin/notes
.
c:
Spli
t
notes ref DWIMmer
y
into a separate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
notes
.
c: Use tw
o
newlin
e
s (instead of o
n
e
)
when concatenat
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(tri
v
i
al) t330
3
:
I
n
dent wit
h
t
abs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
not
e
s
.
h/c: Propagate
c
ombine_notes_fn return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
h/c: A
l
low combine_not
e
s
functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Her
l
and
notes
.
c: Reorder f
u
nct
i
ons in prepar
a
t
i
on for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
tes
.
h:
Make
d
efault_notes_
r
ef() ava
i
lable in
n
ot
e
s API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
(trivial
)
notes
.
h: Mi
n
or documen
t
ation fixes to
cop
y
_note
s
()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
notes
.
c
:
Hexify S
H
A1 in die() mess
a
ge from in
i
t
_notes
(
)
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
ohan
H
erland
no
t
es: Don't create (
e
mpt
y
) commit when
removing non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an
Herland
Enable
cu
s
tom schemes f
o
r
colu
m
n
color
s
i
n
t
he graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_n
e
xt_
l
ine()
a
vai
l
ab
l
e in
t
he graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
rev
i
sion: Turn off hi
s
tory simplif
i
c
a
t
ion
in --an
c
estry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
r
e
vision: Fix
t
ypo in --
a
ncestry-path error m
e
ssage
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Docum
e
ntatio
n
/rev-list-o
p
tions
.
txt: Explain --
a
n
c
e
stry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herl
a
nd
Documentation/rev-list-op
t
ions
.
txt: Fix missing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
han Herland
d
if
f
.
c: En
s
ure "i
n
dex $fr
o
m
.
.
$to"
li
n
e con
t
ains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
J
oh
a
n Herland
builtin
-
notes: Min
o
r (
m
ostly pa
r
se_option
s
-rela
t
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
h
an Herland
submodule sum
m
ary: Don't barf whe
n
invoked
i
n an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-n
o
tes: Add "copy" subcommand for copying
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
b
uil
t
in-notes: M
i
sc
.
r
e
fa
c
toring of
a
r
g
c and exit valu
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erla
n
d
bu
i
ltin
-
n
o
t
e
s
: A
d
d
-c/-C options for
r
eusing no
t
es
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-no
t
es: Refactor 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
H
er
l
a
n
d
b
u
i
ltin-not
e
s: Deprecate th
e
-m/-F options fo
r
"git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
b
uiltin-notes: Add "ap
p
end" subcommand for
a
p
p
ending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
e
r
l
a
nd
bu
i
lti
n
-not
e
s: Add "add" subcomman
d
for addi
n
g no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
la
n
d
buil
t
i
n
-no
t
es:
Ad
d
-
-
message/--file aliase
s
for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
buil
t
in-notes: Add "l
i
st"
s
u
bcomman
d
for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
D
o
cumentation: Gene
r
alize git-
n
o
tes docs to
'
o
bj
e
cts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Ad
d
"prune" su
b
c
o
m
mand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
er
l
and
Notes API: prune_notes():
P
rune note
s
that belong to
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
t33
0
5: Verify
that removing notes triggers automa
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rlan
d
b
uiltin-no
t
es: Add "
r
emove
"
subcomm
a
nd
f
or removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
T
e
ach bui
l
tin-not
e
s
to remove
em
p
ty note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
Teach notes code to properly preserve non-n
o
te
s
i
n
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Her
l
and
t3305: Verify that adding many notes w
i
th g
i
t-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
t3301
:
Verify successful annota
t
i
on of non-com
m
its
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Builtin-ify git
-
notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Re
f
actor no
t
es concatenation int
o
a
flexibl
e
interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: A
l
low multiple
c
oncurre
n
t
n
otes
t
rees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Her
l
and
N
o
tes API: write_notes_t
r
ee(): Store t
h
e notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rl
a
nd
Note
s
A
PI
:
f
or_ea
c
h_note():
Trave
r
se
t
he
entir
e
notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes
A
PI:
g
e
t
_note():
Return
the note annotating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
land
Notes
A
PI: remove_note(
)
: Rem
o
ve note objects
from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
Notes API
:
a
d
d_note(): Add
note objects to
the
i
nternal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Note
s
AP
I
: i
n
it_notes(): Initia
l
i
ze the notes
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
He
r
lan
d
A
d
d te
s
ts
for checking correct
handling of $GIT
_
NOTES_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Notes
A
PI: get_
c
ommit_notes(
)
-> for
m
at_note
(
) + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Minor cosmet
i
c fixes
t
o notes
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an Herland
builtin-
c
onfig: Fi
x
c
r
ash when using
"
-f <
r
elative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
A
dd more
t
es
t
cases to test fast-import of notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herla
n
d
Ren
a
me t9301 to t9350, to
make room
f
o
r mo
r
e fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-impor
t
: Proper notes tree manipu
l
ation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Herland
Fix c
r
asher
on enco
u
n
t
ering SHA1-like non-note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan
H
erland
Basic build infrastructu
r
e
f
or Python scripts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han H
e
rla
n
d
Add selfte
s
t
s
v
erifying con
c
atenation of multiple notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Refactor notes cod
e
to
c
oncat
e
n
ate multiple n
o
tes annotatin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herlan
d
Add sel
f
t
ests verifying
t
hat w
e
can p
a
rse no
t
es
trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Teach the n
o
tes lookup code to pa
r
se n
o
tes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
e
rland
T
each notes
code to free
i
ts int
e
rnal dat
a
structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next