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 'nd/unpack-entry-optim-in-pack-objects'
2013-09-24
Johan
H
erland
sample pre-co
m
mit ho
o
k
: use --bool when retrieving
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Herland
t3200: Add test demonstra
t
i
n
g
m
inor regression in 41
c
21f2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
land
Refer to branch
.
<na
m
e
>
.
remote/
m
e
rge
w
h
en documenting
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
la
n
d
t3
2
00: Mi
n
or
fix when preparing f
o
r t
r
ackin
g
failure
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-09-09
Johan He
r
land
t2024: Fix &&-cha
i
ni
n
g and a
c
ouple
o
f typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Johan Herland
M
o
ve create_note
s
_com
m
it() from
notes-merge
.
c
into
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
Joha
n
Herland
M
o
v
e
copy_note_
f
or_rewrite + friends from bu
i
ltin/
n
o
t
es
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-06-12
J
ohan Herland
finish_co
p
y
_
n
o
t
e
s_for_rewri
t
e():
Let
c
aller provid
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
gl
o
ssary: Updat
e
a
n
d
r
ep
h
rase th
e
d
e
fin
i
tion of a remote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Her
l
an
d
branch
.
c: Validate trac
k
ing branches
w
it
h
r
e
fs
p
ecs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan
H
e
rlan
d
t9114
.
2: Don't use --tra
c
k option against "svn-r
e
mote
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t7201
.
24: Add refspec to keep --track wor
k
i
n
g
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
t32
0
0
.
39
:
tracking setup should fail if
there is no
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
ch
e
ckout: Use
r
e
m
ot
e
r
e
f
s
pecs when DWIMming tracki
n
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herland
t2024: Sh
o
w failure t
o
use refspec when DWI
M
mi
n
g remo
t
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
t2
0
24
:
Add test
s
ver
i
fy
i
ng
c
u
r
rent D
W
IM
b
ehavior
of
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herland
git
symbol
i
c-ref -
-
de
l
e
t
e
$
s
ymref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
Johan Herlan
d
Fix
f
ailure to de
l
ete a packe
d
ref through a symref
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-10-21
J
ohan Herland
t14
0
0-upda
t
e-ref:
A
dd t
e
s
t verifying bu
g
with symrefs
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-
m
erge: Don't remove
.
g
i
t/NOTE
S
_
M
ER
G
E
_WORKTREE
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Johan
Herlan
d
notes-merge: use opend
i
r/readdi
r
in
s
tea
d
of using r
e
a
d
_
d
i
rec
.
.
.
Updated-by:
Johan Herland
<johan@herland.net>
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2012-03-15
Jo
h
an Herl
a
nd
t3310: i
l
lustr
a
te fa
i
lure to "notes merge --c
o
mmit
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herland
f
a
s
t-import: Fix incorrect f
a
nout level when
modi
f
ying
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
an Herland
t
9301:
A
dd 2nd testca
s
e exposing bugs in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-11-29
J
o
h
a
n
Herland
t9301: Fix t
e
stca
s
e cover
i
ng up a bu
g
in fast-import
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-05-13
J
ohan Herland
t
5
400: Fix
a
couple of typos
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
n
d
Mark dirstat error mess
a
ges for
translation
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
an Herland
Improve error handling when
p
arsing
d
i
rstat param
e
ters
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
New
-
-d
i
rstat=lines mode, do
i
ng
d
i
rstat
an
a
ly
s
is based
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
J
o
ha
n
Herland
A
llo
w
specifying
--dirstat cut-o
f
f p
e
rcentage
as
a
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add config variable
for s
p
ecifying d
e
fau
l
t --dirstat
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Jo
h
a
n Herland
Ref
a
ctor --dirs
t
at
pa
r
s
i
n
g; deprecate --cumu
l
a
t
ive
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan H
e
rland
M
ake --dirst
a
t=0 output directories th
a
t
c
o
n
tribute
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-29
Johan
H
erland
Add s
e
veral testc
a
ses
f
or --
d
irstat and frien
d
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herl
a
nd
--d
i
rstat: In case of renames, use target filename
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
r
land
Teach
-
-d
i
rstat n
o
t to completely ignore rearr
a
nged
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Her
l
an
d
--di
r
stat-by-file: Make i
t
faster and more corr
e
ct
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-dirstat: Des
c
ribe non-obvious differences relat
i
ve
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "git notes add" more us
e
r
-fr
i
endly
w
hen there
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herlan
d
log/pretty-opt
i
ons:
D
ocument --
[
no-]no
t
es and dep
r
ecate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-17
Jo
h
a
n
Her
l
and
branch/checko
u
t
-
-trac
k
: Ensure that upstream branc
h
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2011-02-16
Johan Herland
push
.
default: Re
n
a
m
e
'
tra
c
king' to 'upstream'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
Pro
v
ide 'gi
t
merge --abort' as a synony
m
to 'gi
t
reset
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
cm
d
_m
e
rge():
P
a
rse op
t
ions
b
efore
c
hecking MERGE
_
HEAD
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Provide 'git note
s
get-ref'
t
o easily retrieve current
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
git notes
m
erge: Add testca
s
es for merging notes
tree
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
g
i
t
n
otes merge: Add
a
noth
e
r
a
uto-re
s
ol
v
ing strategy
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes m
e
rge: --
c
om
m
it
sh
o
u
l
d fail if un
d
erlyin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rland
gi
t
notes
merge: List conf
l
icting notes in n
o
tes mer
g
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes
mer
g
e
:
Man
u
al
c
onflict resolution, part 2/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git
n
ot
e
s merg
e
: Manual co
n
f
l
ict resolution
,
part 1/2
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
D
o
cumen
t
ation
:
Preliminar
y
do
c
s
o
n '
g
it note
s
m
erge'
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
gi
t
no
t
es
merge:
Add
autom
a
tic conflict resolvers
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
gi
t
notes merge
:
Ha
n
dle real
,
non-
c
onflicting
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n Herland
built
i
n/
n
otes
.
c: Refactor creation of notes c
o
mmits
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herla
n
d
git no
t
es merge: Ini
t
ia
l
i
mplementation han
d
ling triv
i
a
l
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
builtin/notes
.
c
:
Split notes ref DWIMmery
in
t
o
a
s
e
p
arate
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
notes
.
c:
Use two
n
ewlines (instead of one)
whe
n
con
c
atenatin
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
(trivial) t3303: Indent with t
a
bs
i
nst
e
ad of
s
p
a
c
e
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
note
s
.
h/c: Propagate c
o
mbine_
n
otes_fn
r
e
tur
n
va
l
u
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an He
r
land
n
o
tes
.
h
/
c: Allow comb
i
ne_notes f
u
nctions to
r
emove
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
n
o
tes
.
c:
R
eorder funct
i
ons in preparation for next
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
h
:
Make de
f
a
u
lt_no
t
e
s
_
ref() availab
l
e in notes
API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
(trivial) n
o
t
es
.
h: Minor documen
t
ation fix
e
s to copy_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
n
o
t
es
.
c:
H
exif
y
SHA1 in di
e
() message f
r
om init_notes()
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-08-31
Johan
H
erland
not
e
s: Don't create (emp
t
y) commit w
h
en
r
emoving
n
on
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Johan
Herland
Enable
cust
o
m scheme
s
for column
c
olor
s
in the graph API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-07-13
Jo
h
an H
e
rland
M
ake g
r
aph_next_line
(
) available in the
graph
.
h API
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan H
e
rland
re
v
isi
o
n: T
u
r
n
off
hist
o
ry simplificati
o
n
i
n --
a
ncestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
revisio
n
: Fix
t
ypo
i
n --ancestry-path error message
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
D
o
cumenta
t
ion/rev-lis
t
-option
s
.
tx
t
: Expl
a
in --ancestry
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
ocu
m
entation/rev-list
-
o
p
t
i
on
s
.
t
x
t: Fix
m
i
s
sin
g
lin
e
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-06-01
Johan Herland
diff
.
c: Ensur
e
"index $fr
o
m
.
.
$
t
o" line contains unamb
i
g
u
ous
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-25
Johan Herland
bui
l
t
in-notes:
Mi
n
or
(
m
ostly pars
e
_options-related
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
s
u
bmodu
l
e s
u
mmary: Don't barf when invoked in an e
m
p
t
y
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
land
buil
t
in-no
t
e
s
:
Add "cop
y
" subcommand for copying
n
otes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes:
M
is
c
.
refac
t
o
r
ing of
a
rgc and exit va
l
ue
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
b
u
i
ltin-n
o
t
e
s
: Add -c/-C options f
o
r
re
u
sing notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herland
builtin-notes: Refactor handl
i
ng of -F
option to
a
ll
o
w
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herla
n
d
built
i
n-no
t
es:
D
epr
e
cat
e
the -
m
/-F opt
i
ons f
o
r "git
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-
n
otes: Add
"
append" s
u
bcommand f
o
r appending
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builti
n
-notes: Add "add" s
u
bcommand for
a
d
din
g
note
s
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
Herland
b
u
iltin
-
notes:
A
dd --message/--file
alia
s
es
f
or -
m
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
builtin-notes: Add "list" subcomman
d
for listing note
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Document
a
tion: General
i
ze git-notes do
c
s to 'objects
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
He
r
land
b
u
i
lt
i
n-notes: Add "p
r
une" subc
o
mmand
f
or removin
g
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Note
s
A
P
I
: prune_notes()
:
Pru
n
e notes that belong
t
o
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herl
a
nd
t3305
:
Verify that removing notes triggers automatic
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
builtin-notes: Add "remo
v
e" subcommand for removing
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
T
ea
c
h builti
n
-notes to r
e
mov
e
empty notes
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Teach notes
code to properly
p
reserve no
n
-notes in
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
He
r
land
t3
3
0
5
: Ver
i
fy that
a
dding ma
n
y n
o
tes w
i
t
h
git-notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
t3301: Ve
r
ify succ
e
ssful annota
t
ion
of non-commits
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Builtin-ify
git-note
s
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Refactor
n
ote
s
concatena
t
ion into
a
f
l
exibl
e
interf
a
ce
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes API: Allow mul
t
iple concurrent notes trees with
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n He
r
l
and
N
otes API
:
wr
i
te_no
t
e
s
_tree(): Store the
notes tree
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: for_each_
n
ote(): Traverse the entire notes
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
J
oha
n
Herland
No
t
es API:
get_note(): R
e
turn
the note annotat
i
ng the
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
and
Notes API: remove_note(): Remove n
o
te objects from
.
.
.
Signed-off-by:
Johan Herland
<johan@herland.net>
commit
|
commitdiff
|
tree
next