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
Add config variable for specifying default --dirstat behavior
2011-04-29
J
oha
n
Her
l
and
A
dd
config v
a
riab
l
e for
s
p
ecifying
default --dirstat
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Refac
t
or --dirstat par
s
ing;
d
e
p
r
e
c
a
te --cumulative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n
Herland
Make --d
i
rstat=0
output directories
t
hat c
o
ntribute
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Her
l
and
Add severa
l
test
c
ases for -
-
dir
s
tat and
friends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--di
r
stat: In c
a
se of renames, use targe
t
filename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an
H
e
rland
Teach -
-
dirstat
n
ot to complet
e
ly ign
o
re rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--di
r
stat-by-file
:
Ma
k
e it faster a
n
d
mo
r
e correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
irstat: Describe no
n
-obvious
d
i
fferen
c
es relat
i
ve
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
erland
branch
/
checkout --track: Ensure that upstream
branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herl
a
nd
push
.
de
f
ault: Re
n
a
m
e 'tracki
n
g' to 'ups
t
ream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
P
rovide 'git merge -
-
a
bort' as
a
sy
n
on
y
m
to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
cmd_
m
e
rge():
Parse options before checking MERGE_HEAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an H
e
r
l
a
nd
Pr
o
vide 'g
i
t notes g
e
t
-
r
e
f' to easily retrieve c
u
rrent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git note
s
merge: Add testcases for
m
erging
n
ot
e
s trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
n
otes merge:
A
dd another auto
-
resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
g
i
t
n
otes m
e
rge: --commit
s
hould fail if underlyin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herl
a
nd
git not
e
s merge:
L
ist conf
l
i
cting notes
i
n n
o
t
es merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes
merge: M
a
nual conflict reso
l
ution, part 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n He
r
land
git notes
m
erge:
M
anual conflic
t
re
s
olu
t
i
o
n,
p
art 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
D
o
c
u
mentati
o
n: Prelim
i
nary docs o
n
'git notes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
git notes m
e
rge: Add autom
a
tic conflict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git n
o
tes merge: Hand
l
e real, non-conf
l
icti
n
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: Refactor
c
rea
t
i
o
n of
notes commit
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git
notes mer
g
e: Initial imple
m
e
n
tati
o
n
handl
i
n
g
trivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes
.
c: S
p
lit n
o
t
e
s ref DWIMme
r
y into a s
e
parat
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
c: Use
two ne
w
line
s
(
i
nst
e
a
d
of one) when concate
n
a
tin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
(tr
i
vial) t3303: Indent wi
t
h tabs instead of
s
paces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h
/c: Propagat
e
combine_notes_f
n
return
v
a
lue
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
h/c: Allow combine_n
o
tes functions to rem
o
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
c: Reorder func
t
ions in preparation
for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herlan
d
n
o
tes
.
h:
M
ake d
e
fault_notes_ref
(
) avai
l
able in not
e
s API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
(trivial) notes
.
h
: M
i
nor documentation fixes to copy_not
e
s(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: H
e
xify SHA1 in d
i
e() message fro
m
i
n
it_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Joha
n
Herland
notes:
Don't
c
reate (empty)
c
om
m
it whe
n
remo
v
in
g
n
on
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable
c
u
stom sch
e
mes fo
r
column colors
i
n
the
g
r
aph API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herla
n
d
Ma
k
e gra
p
h_next_line()
available in the graph
.
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Joh
a
n Herland
revision: T
u
rn
off histo
r
y simplification in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Her
l
and
revis
i
on: Fix ty
p
o in
--an
c
estry-pat
h
error messa
g
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
Docume
n
tation/
r
ev-list-option
s
.
txt: Explain --ance
s
try
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
Documentation/
r
ev
-
list-options
.
t
x
t:
Fix missi
n
g
l
ine
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensu
r
e
"index $from
.
.
$to" line contain
s
unambigu
o
us
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
Jo
h
an Herland
b
u
i
ltin-notes: Minor (mostly
p
a
r
se_opt
i
o
n
s-related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Joha
n
Her
l
a
nd
submodule summ
a
ry: Don't b
a
rf when in
v
oked
i
n
a
n
e
mpty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
built
i
n-notes:
A
dd "copy" subc
o
mmand for cop
y
i
n
g notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
buil
t
in-not
e
s
:
Misc
.
refactoring o
f
argc and exit
value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
b
uiltin-notes: Add -c/-C o
p
ti
o
n
s
for reusing note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
uiltin-notes: Refa
c
t
o
r ha
n
d
ling of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-no
t
es:
D
eprecate th
e
-m
/
-F opt
i
ons
f
or "git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n Her
l
and
builtin-notes: Add "appen
d
" subcommand for
appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
b
u
iltin
-
note
s
: Add "add" subco
m
mand for
a
dd
i
n
g
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
iltin
-
notes: Add --message/--file aliases for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
builtin-not
e
s:
Ad
d
"list" subcom
m
a
n
d for
listing
n
ot
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Docu
m
entation: Generalize git-notes docs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-
n
otes: Add "prune" subcom
m
an
d
for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan He
r
land
Notes API: prune_no
t
es(): P
r
une n
o
tes th
a
t belon
g
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
t33
0
5: Verify that removing not
e
s triggers autom
a
t
i
c
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
builtin-n
o
tes: A
d
d "remove" sub
c
ommand for
removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach builtin-notes to re
m
ove e
m
pty n
o
tes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan
Herla
n
d
Teach notes code to pr
o
perly
preser
v
e
non-notes
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
t
3305:
Verif
y
that adding
many note
s
w
i
t
h git-not
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3
3
01: Ve
r
if
y
succes
s
ful anno
t
ation of non-
c
o
m
mits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herlan
d
B
uiltin
-
ify
g
it-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Refactor notes
c
oncatenation
into a f
l
exible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
a
n
H
e
rlan
d
Notes
A
PI: A
l
low
m
u
ltiple concurrent not
e
s tre
e
s with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
N
o
tes API: write_no
t
es_tree():
S
tore the notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
P
I:
f
o
r_eac
h
_note()
:
T
raverse the enti
r
e
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herl
a
nd
N
otes
A
PI: get_no
t
e(): R
e
turn the note annota
t
ing the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herla
n
d
Notes API
:
r
e
m
o
ve_n
o
te(): Re
m
ove
n
ote
o
bjects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: add_
n
ote(): Add note obje
c
ts to th
e
i
ntern
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
e
rland
Not
e
s API: init_no
t
e
s(): Initialize
t
he notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Her
l
a
nd
Add tests
f
o
r
c
heckin
g
corre
c
t hand
l
i
ng of $GIT_NO
T
ES_
R
EF
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API
:
get_commit_notes()
-
> format
_
note() + r
e
mov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Mi
n
o
r cosmetic fixe
s
to n
o
tes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan He
r
land
builtin
-
config: Fix
cra
s
h when using "-f <rela
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan He
r
land
Add more te
s
t
c
ases t
o
test
fast-import of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
R
e
name t9301
to t9350, to ma
k
e room for more fast-
i
mport
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
fast-import
:
Proper notes tree manipulation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-03
Johan He
r
land
F
i
x crasher on encounte
r
ing SHA1-l
i
ke non-note in
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-11-18
Jo
h
an Herland
B
asic bu
i
ld
i
nfrastructu
r
e for Python sc
r
i
p
t
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan H
e
rland
Add
selftests
v
erify
i
ng
concatenatio
n
of
mult
i
ple
notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Refactor notes co
d
e to conca
t
enate
multipl
e
notes annotating
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
o
han Herla
n
d
Add s
e
lftests verifying t
h
a
t
we
c
an parse notes
t
rees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Teach th
e
note
s
lookup code to parse notes tr
e
es
w
ith
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joha
n
Herland
Teach notes code to free its intern
a
l
data structures
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
Add fla
g
s
to get_commit_notes()
to contr
o
l the format
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Joh
a
n Herland
t3302-not
e
s
-i
n
dex-expens
i
ve: Spe
e
d
up crea
t
e
_
r
e
po
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
J
ohan Herland
f
a
st-im
p
ort: Add
supp
o
rt for i
m
po
r
ting commit notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-10-20
Johan Herland
T
each "-m
<msg>"
and "
-
F <file>"
to "
g
it notes
edit"
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan Her
l
and
git cl
o
ne: Add
-
-r
e
cursive
t
o automatical
l
y
check
o
ut
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-20
Johan H
e
rland
t7407: Use 'rev-par
s
e --short' r
a
th
e
r
than bash's substri
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git submodule
status
:
Add --recursive
to recurse into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
git
s
ubmodul
e
u
p
date: Introduc
e
--recursive to update
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
o
h
an Herl
a
nd
git
s
ubmodule foreach: Add --recursiv
e
to recurse i
n
to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
J
ohan Herland
g
i
t submodule
foreach:
t
est a
c
cess t
o
s
ubmod
u
l
e
name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Herland
A
d
d selftes
t
f
o
r
'g
i
t submodule foreach
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-19
Johan Her
l
and
git submodule: Cleanup
u
s
a
ge
s
t
r
ing and add option
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-18
Johan
H
erland
git s
u
bmodule
f
o
reach: P
r
ovide
ac
c
ess
to submodu
l
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-08-12
Joha
n
Herland
help
.
c: give
c
o
r
rect struc
t
u
r
e's size to memset()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-07-11
Johan Her
l
and
qu
i
c
k
fetch(): Prevent overflow of t
h
e
r
e
v-list
command
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-06-03
Joh
a
n
Herl
a
n
d
git-submo
d
ule
:
add support for
-
-merge
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next