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
git-subtree: fix typo in manpage
2012-10-21
Johan
Herland
Fi
x
fa
i
lure to delete a
p
a
c
ked ref th
r
ough a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
o
h
a
n
H
e
r
land
t
1
4
00-
u
pdate
-
ref
:
Add
test
verifyi
n
g bug with
s
ymrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan H
e
rland
notes-
m
er
g
e:
D
o
n't
rem
o
ve
.
git/NOTES_MERG
E
_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an He
r
l
a
nd
n
otes
-
merge: use opendir/r
e
addir in
s
tead of
u
sing read_direc
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
t
3
310: illustrat
e
fai
l
u
re to
"notes me
r
ge
--
c
omm
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
fast-impo
r
t: Fix in
c
o
rrect fanout level when modifying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an H
e
rland
t9301
:
Add 2nd testca
s
e
e
xposing bugs i
n
fast-
i
mport
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan H
e
r
l
and
t9301
:
Fix testcase co
v
ering up a bu
g
in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
Johan Her
l
and
t
5
400: Fix
a
couple of typ
o
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herlan
d
Mark dirstat error messages f
o
r translat
i
on
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n Herland
Im
p
rov
e
e
r
ror handli
n
g
when par
s
i
n
g dirstat parameters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
New
--d
i
r
stat=l
i
n
es
mode, doing
d
irstat anal
y
sis based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Al
l
ow specify
i
ng --dirstat cut-off percentage as a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erl
a
nd
Ad
d
config variable for specifying
d
efault --di
r
stat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herla
n
d
Refactor --dirstat parsin
g
;
deprecate --cumulative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
M
a
ke --dirstat=0
output
directories that
c
ontribut
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several t
e
s
tcases for --di
r
sta
t
and
f
r
ie
n
ds
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan
H
e
r
lan
d
--dirstat
:
I
n
c
a
s
e
o
f
renames, use
target f
i
lename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
H
e
r
land
Teach
--dirstat not to co
m
pletely
i
g
n
ore
r
earran
g
ed
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herlan
d
--
d
irstat-by
-
file:
Make it faster an
d
more correct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
-
-
dirstat: Describe non-o
b
viou
s
diffe
r
ences
relative
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git not
e
s add" mor
e
user-fr
i
e
nd
l
y when there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
lo
g
/pretty-opt
i
on
s
: Document --[
n
o
-]no
t
e
s
a
n
d
d
e
prec
a
te
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
J
ohan Herlan
d
bran
c
h/checkout
-
-tr
a
ck:
E
nsu
r
e that ups
t
ream branch
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
J
o
han Herl
a
nd
push
.
default: Rename 'tracki
n
g
' to 'upstrea
m
'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
P
rovide 'git
merg
e
--abort'
a
s a sy
n
onym to 'git res
e
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
cmd
_
m
e
rge(): Parse options b
e
f
ore c
h
ecking MERGE_HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
r
ovid
e
'git notes
get-ref' to easily retri
e
ve
curren
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
notes
m
erge: Add
testcases for
merging notes tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
notes merge: Add anot
h
er
a
uto-resolving stra
t
e
gy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git
notes me
r
g
e: --commit should
f
ail if
underl
y
ing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
note
s
me
r
g
e
: List
c
onfl
i
c
ting notes in
notes merge
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herlan
d
git notes m
e
rge:
Ma
n
u
al
c
onflict resoluti
o
n,
p
a
r
t
2
/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n H
e
rland
git notes merge:
Manual conflict resolution, part 1
/
2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
Docu
m
entat
i
on: P
r
eli
m
inary docs o
n
'git notes merge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add au
t
omatic conflict
r
e
solvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
e
r
l
a
nd
git notes merge: Ha
n
dle real, non-conflicting notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an
H
erla
n
d
builtin/notes
.
c:
Refact
o
r
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:
Init
i
al implementati
o
n
ha
n
dling trivial
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
builtin/notes
.
c:
S
p
lit no
t
es ref DWIMmery into a se
p
arat
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herl
a
n
d
notes
.
c: Use two newlines
(
i
nstead of one) when concatenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(trivia
l
) t3303: Inde
n
t wi
t
h
tabs instead of spaces
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
notes
.
h
/
c: Propagate combin
e
_notes_
f
n return value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
no
t
es
.
h/c: Allow combine_not
e
s functions to remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
la
n
d
n
otes
.
c
:
R
eorder fu
n
ctions in prep
a
ration for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rl
a
nd
notes
.
h:
M
ake d
e
fault
_
notes_
r
ef() av
a
i
lable in note
s
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan He
r
la
n
d
(
t
r
ivial) notes
.
h: Minor document
a
tion
fixes
t
o
copy_no
t
es()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
notes
.
c
:
Hexify SHA1 in die() message
f
r
om init_not
e
s()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
J
o
han Herland
notes: D
o
n't
c
reate (
e
mp
t
y) c
o
mmit
when
r
emovi
n
g non
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
and
Enable custom sche
m
es f
o
r column colors in the
g
raph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Her
l
and
Make grap
h
_
n
ext
_
line() available in the gr
a
ph
.
h
AP
I
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rla
n
d
revisi
o
n: Turn off
h
istor
y
simplific
a
tion in -
-
anc
e
s
t
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
r
e
vi
s
ion:
F
i
x
typo i
n
--a
n
cestry-
p
ath error me
s
sa
g
e
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Do
c
u
ment
a
tion
/
rev-list-options
.
txt:
Explain --ance
s
t
r
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
o
cumentation/
r
ev-l
i
st-
o
ptio
n
s
.
t
x
t: Fix mi
s
sing line
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
J
o
han Herl
a
nd
diff
.
c: Ensure "
i
ndex $from
.
.
$t
o
" li
n
e con
t
ains unambiguous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an Herland
b
uil
t
i
n-notes: Minor (mostly parse_o
p
tions-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
J
o
han H
e
rland
submodule summary: Don't bar
f
w
h
en
i
nvoke
d
in an empty
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
builtin-not
e
s:
A
dd
"
copy" subcomman
d
for
c
opying notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
H
e
r
land
b
u
iltin
-
note
s
: Misc
.
refactor
i
n
g
of
a
r
g
c
a
n
d exit value
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Add -c
/
-C options for reusi
n
g notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rla
n
d
builtin-notes:
R
e
f
actor handling of
-F option to allow
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
bu
i
ltin-
n
otes: Deprecate
the -m/-F options for "g
i
t
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
rland
b
uiltin-no
t
es:
A
d
d
"
append" subcommand for appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
b
uil
t
in-note
s
: Add "add"
s
ubcommand for adding notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builtin-not
e
s: Add --message/--
f
ile alias
e
s for -m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an
H
e
r
land
b
u
ilt
i
n
-notes: Add
"list" su
b
c
o
mmand for listing
n
ote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Do
c
umentat
i
o
n
:
G
enerali
z
e git-notes docs to
'
o
bj
e
cts
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
builtin-notes: A
d
d "prune" subcommand for
r
e
moving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
Notes API:
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: Veri
f
y that rem
o
ving
notes t
r
i
g
ger
s
a
utoma
t
ic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
ha
n
Herlan
d
builtin-notes: Add "remove" s
u
bcommand for removi
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herl
a
n
d
Teac
h
builtin-note
s
t
o remo
v
e
e
mpty
n
otes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oh
a
n He
r
l
a
nd
Teach note
s
co
d
e to properly preserve non-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t330
5
: V
e
r
i
f
y
that addin
g
many
note
s
with git
-
note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
t
3
301:
Verify succes
s
f
u
l annotation of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Builtin-ify
g
it-notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
R
ef
a
ctor notes concat
e
nation
into
a
flexible interface
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Notes AP
I
:
Al
l
ow multiple concurren
t
notes trees w
i
th
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
No
t
es A
P
I: write_n
o
t
e
s_tre
e
(): Store the note
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
Note
s
API: for_each_note(
)
: Tr
a
vers
e
the entire no
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
H
e
r
land
Notes API: get_note()
:
Return
t
he note
an
n
otating the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
Not
e
s AP
I
: remove_note(): Remove
n
ote objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herl
a
n
d
N
otes API: add_note(): A
d
d
not
e
obje
c
ts to
the internal
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes
API: init_n
o
tes(): Initialize the note
s
tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
A
dd te
s
ts for checking correct handling of
$GIT_NOTE
S
_REF
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Notes API
:
get_
c
ommit_notes() -> format_note() + remove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
He
r
lan
d
Minor cos
m
etic fixes
t
o
n
o
t
es
.
c
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-01-26
Joh
a
n
Herland
builtin-co
n
fig: Fix crash
when using "-f <re
l
at
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Add more
t
estcas
e
s to test
fast-
i
m
p
or
t
of
note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Rename t930
1
to t9350, to make
r
oom for more
f
ast
-
import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herlan
d
fast-impor
t
: Proper notes tree manipulation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-12-03
Johan Her
l
a
n
d
Fix
c
r
ashe
r
on encountering S
H
A1-like non
-
note in notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-11-18
Johan Herland
Bas
i
c build infrastr
u
cture fo
r
P
y
thon s
c
r
ipts
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erland
A
d
d s
e
lftests verify
i
ng concatenati
o
n of multiple n
o
tes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
e
rland
R
e
factor no
t
es
c
ode to concat
e
nate multiple
notes a
n
notating
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Add self
t
e
sts verif
y
ing t
h
at we can
p
arse
n
otes trees
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Her
l
a
nd
Teach the notes
l
o
o
kup co
d
e to parse notes tre
e
s with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Teach notes
c
ode to
f
ree its internal data structures
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n
H
erl
a
n
d
A
d
d flags to get_
c
o
mmi
t
_
notes() t
o
control the format
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next