repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Mark dirstat error messages for translation
2011-04-29
Johan H
e
rland
Mar
k
dirstat error mess
a
ges for translation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
n
d
Impro
v
e
er
r
or ha
n
dling wh
e
n par
s
ing dirstat pa
r
am
e
ter
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
He
r
land
New --dirstat=lines mode, doing dirsta
t
analysis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Allow speci
f
ying --di
r
stat cut-off percent
a
ge as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config variable for specifyin
g
d
e
fault
--
d
irstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herl
a
n
d
Refactor -
-
di
r
stat pa
r
sing
;
dep
r
ecate -
-
cumulativ
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Make -
-
dirsta
t
=0 output directo
r
ie
s
that co
n
tri
b
ut
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
A
dd s
e
veral testc
a
ses for --dirstat
an
d
f
r
ien
d
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
J
oh
a
n Herland
--
d
irstat: In
c
ase o
f
renames, use
target filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
ha
n
H
e
rland
Teach --dirstat
n
o
t
to completely ignore re
a
rranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirst
a
t
-
by
-
fil
e
: Make it faster and more correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herla
n
d
-
-
dirstat:
D
escribe non
-
obvious d
i
fferences re
l
a
tiv
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
branch/c
h
eckout --tr
a
ck: En
s
ure that upstream branc
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan
H
e
r
land
push
.
d
efault: Rename
't
r
acking
'
to 'upst
r
eam'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
P
rovide 'git
m
erge --abort'
a
s
a
synonym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cm
d
_merge(): Parse options
b
efore c
h
ecking ME
R
GE_
H
EAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herlan
d
Provide
'
git notes get-ref' to easily
r
e
t
rieve cu
r
rent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
gi
t
note
s
merge: Add testcases for merging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
g
i
t notes me
r
ge: Add a
n
other auto-resolving strat
e
g
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git notes
m
er
g
e
:
-
-
c
ommit sh
o
uld fail if
u
nde
r
lying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n He
r
land
git notes merge: List
c
o
n
flicting notes in notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes
merge: Manual conflict r
e
solution,
part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes mer
g
e: Manual conflict resolution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herla
n
d
Docum
e
ntation: Preli
m
inary docs on 'gi
t
notes m
e
rge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add automat
i
c
c
onfli
c
t res
o
lvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge:
H
andle real, non-
c
onflictin
g
no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
builtin/n
o
tes
.
c: Re
f
a
c
t
or
cre
a
t
i
on of notes c
o
mmi
t
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes
m
e
rge
:
Initial implement
a
t
i
on
handlin
g
trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herlan
d
builtin/n
o
tes
.
c
:
Split notes ref D
W
IMme
r
y into a
s
epa
r
ate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
c:
U
se two n
e
wlines (in
s
tead of one) wh
e
n
c
oncatenatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(
t
rivial) t330
3
: Indent wi
t
h
t
a
bs i
n
st
e
ad
o
f spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
not
e
s
.
h/c:
P
ropagat
e
combine_no
t
es_fn return
v
alue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an Herland
notes
.
h/c:
A
llow combine_no
t
es func
t
ion
s
t
o rem
o
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
no
t
e
s
.
c
:
Re
o
rder functions in preparat
i
on f
o
r
next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
no
t
es
.
h: Make default_not
e
s_ref()
ava
i
lable i
n
notes A
P
I
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an Herland
(triv
i
al) notes
.
h: Minor docum
e
ntation f
i
x
e
s t
o
copy_not
e
s
()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
c: Hexify SHA1 in d
i
e() message
f
rom init_notes
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
an H
e
rl
a
n
d
notes: Don'
t
c
r
eate (empty)
c
om
m
i
t when rem
o
ving n
o
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Her
l
an
d
Enable c
u
stom scheme
s
for column col
o
r
s
in
the
g
raph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan H
e
rla
n
d
Make gra
p
h_next_
l
in
e
() available in the g
r
aph
.
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herla
n
d
revision: Tur
n
o
f
f hist
o
r
y
s
i
m
pli
f
ication in
-
-ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
Herl
a
nd
rev
i
sion: Fix typo i
n
--an
c
estry-p
a
th error
messa
g
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Her
l
a
nd
Documentation/rev-
l
i
s
t-options
.
txt: Explain --ances
t
r
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joha
n
H
e
r
la
n
d
Docume
n
t
a
tion
/
rev-list-options
.
tx
t
: F
i
x missing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
J
ohan Herland
diff
.
c
:
En
s
ure "index
$from
.
.
$to" line cont
a
ins unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Johan Her
l
and
builtin-notes:
Minor (most
l
y
pars
e
_optio
n
s-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodule summary: Don't ba
r
f when i
n
voked in an
e
m
pty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
builtin-n
o
tes: A
d
d "copy"
s
ubcomma
n
d for
c
opy
i
ng notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
builtin-notes: Misc
.
refacto
r
ing
of argc
a
n
d
e
xit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
bui
l
tin-n
o
te
s
: Add -c/
-
C
options for reusing
notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
bui
l
tin-notes: Refactor handling of -F
o
ptio
n
to
a
llow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: D
e
precat
e
the
-
m
/
-F opti
o
n
s
for "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es: A
d
d "app
e
nd" subcom
m
and for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
buil
t
in-no
t
es:
A
dd
"add" subcomm
a
nd for adding n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-not
e
s:
A
dd --m
e
ssage/--file aliases
for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
bu
i
ltin-notes:
A
d
d "
l
is
t
" subcommand for
l
isting note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Do
c
umen
t
ation:
Gen
e
r
alize g
i
t-no
t
e
s
doc
s
to 'obje
c
ts
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-note
s
: Add "prune" subcommand for remo
v
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API:
pru
n
e_
n
otes():
Prune notes
t
hat belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t3
3
05: V
e
rify that remov
i
ng notes trigg
e
rs a
u
tomatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
bu
i
lt
i
n
-
n
o
t
es: Add
"
remove" subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
Herland
Teach builtin
-
no
t
e
s
to remove e
m
pty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach notes
co
d
e t
o
prope
r
ly p
r
eserve non-notes in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t
3
305: V
e
rify that a
d
d
ing many not
e
s w
i
th git-notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
t
3
301:
V
erif
y
s
ucce
s
sful
annotation of no
n
-commits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Bui
l
tin
-
i
fy git-not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Re
f
acto
r
notes conc
a
tenat
i
o
n
i
n
to
a
flexible
interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: Al
l
o
w
multiple concurr
e
nt notes trees
with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Her
l
and
Not
e
s
API:
write_notes_tree():
Store th
e
not
e
s tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
o
tes
A
PI: for_each_n
o
te(
)
: Traverse the entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an He
r
land
Note
s
API: get_n
o
t
e
(
): Return the note annotat
i
n
g
t
he
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an H
e
rland
N
o
tes API: remove_note(
)
: Remove note o
b
jects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API
:
add
_
n
o
te():
A
dd note o
b
jects to
t
he int
e
rna
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
Notes API: init_notes(
)
: Initial
i
ze
the n
o
tes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
A
dd tes
t
s fo
r
che
c
king co
r
r
ec
t
handl
i
n
g of $GIT_NOT
E
S_REF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s
A
PI: get_commi
t
_n
o
tes() -> f
o
rmat_note() + remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
M
i
n
o
r cosmetic f
i
xes to notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Jo
h
an Herland
b
u
i
ltin
-
config:
F
i
x cras
h
w
h
en using "-f <relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Her
l
and
Add
more testcase
s
to test
f
a
s
t-imp
o
r
t of no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan
H
erla
n
d
Rename t9301 to
t9350, to make room
f
or more
f
ast-impo
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Joha
n
H
erland
fast-import: Proper n
o
te
s
tr
e
e manip
u
l
a
tion
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Joh
a
n
He
r
land
F
ix crasher
o
n enc
o
untering
S
HA1-like non-note
in n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Joha
n
Her
l
and
Basic build inf
r
astr
u
cture fo
r
Python sc
r
ipts
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
h
an Herland
A
d
d selftes
t
s
v
erifying concate
n
ati
o
n of m
u
lt
i
ple notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Refact
o
r
notes code
to concatenat
e
mult
i
ple n
o
tes
a
n
not
a
t
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
Add selftests
verif
y
ing that we
c
an parse n
o
t
e
s trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herla
n
d
Teach
t
he notes lookup co
d
e to parse notes trees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan
H
erlan
d
T
e
ach n
o
tes code
to fr
e
e
i
ts internal
d
ata
s
tructures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
A
dd flag
s
to get_commit_notes()
t
o cont
r
ol the format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
t
3
302-note
s
-index-
e
xpensive: Speed up create_repo()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
H
erla
n
d
f
a
st-import:
Add
su
p
port for impor
t
ing commit not
e
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han H
e
r
land
Te
a
ch "
-
m
<msg
>
" and "-F
<
file>" to "git notes
edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan
Herland
git c
l
one: Add --recursive t
o
automatically checkout
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Jo
h
an Herland
t7407: U
s
e
'rev-parse
-
-
short' rat
h
er than bash's su
b
s
t
r
ing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submo
d
ul
e
status: Add --recursive
t
o recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Jo
h
an Herland
gi
t
submodule up
d
ate: Introduce --recursive to
upda
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git subm
o
dule
f
oreach: Add --recur
s
ive to
r
ecurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Joh
a
n H
e
rland
git submod
u
le foreac
h
:
test access to
submodule name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herlan
d
Add sel
f
test for 'git submodule foreach'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
a
n
Herland
git submodule:
C
leanup usage string and add o
p
tion
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next