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
glossary: Update and rephrase the definition of a remote-tracking branch
2013-04-21
Johan Her
l
and
g
lossary: Update and rephrase the defin
i
tion of
a
r
emote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
erland
b
ranc
h
.
c: Val
i
date trackin
g
branches with refspecs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
H
er
l
and
t9114
.
2
:
Don't use --track
option against
"svn-remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
t72
0
1
.
24: Add
r
efspec to keep
-
-
track
wo
r
ki
n
g
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
an Herland
t3200
.
3
9
: tracking setup
should fail if there is
no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herland
c
h
eckout: Use remote refspecs when DWIMming
t
r
acking
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Her
l
and
t2
0
24: Show failur
e
to use refsp
e
c
w
h
en
D
WIMmi
n
g
r
emote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t2024: Add tests verifying cu
r
rent
DWIM behavior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan
Herland
git symbo
l
i
c
-
ref -
-
d
e
lete $symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
H
erland
Fi
x
failure to
delete
a
packed ref through a sy
m
ref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erland
t1
4
00-up
d
a
te-r
e
f: Add test verifying bu
g
wi
t
h
s
ymrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merge
:
Don't re
m
ove
.
git/NOTES_MERGE_W
O
RKTREE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
J
o
h
an He
r
land
notes-merge: use opend
i
r/readdir instea
d
of using read_
d
irec
.
.
.
Updated-by: Johan Herland <
johan@herland.net
>
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Her
l
and
t33
1
0: illustrate f
a
il
u
r
e
to
"notes merge --c
o
mmit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan He
r
land
fast-import: Fix incorrect
f
a
nout le
v
el
when modi
f
ying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan Herla
n
d
t9301: Add
2
n
d testcas
e
exposing b
u
gs in fas
t
-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Johan
He
r
land
t93
0
1:
F
i
x testcase cove
r
i
n
g up a bug
i
n f
a
st
-
i
mpo
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
J
o
h
an Herland
t5400: F
i
x
a couple o
f
typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joh
a
n He
r
land
Mark dirstat
error message
s
f
or tr
a
nslation
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Improve error handl
i
ng when par
s
ing dirstat parameters
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
ha
n
H
erland
New --dirst
a
t=lines mode
,
doing
dirstat analysi
s
based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Al
l
ow s
p
ecif
y
ing --dirstat c
u
t-off percentage as
a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Add c
o
n
fi
g
variable for
s
pecifyi
n
g default --dirs
t
a
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Her
l
an
d
R
e
f
actor --dir
s
tat
p
arsing; deprecate --
c
umula
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herl
a
nd
Ma
k
e --dirstat=0 output directories that c
o
ntrib
u
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Add several
t
estcases fo
r
--dirstat and fri
e
nd
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herl
a
nd
-
-
dirstat: I
n
case of renames, use
t
a
rget
fi
l
ename
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach
-
-dir
s
tat not to completely
ignore
rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Her
l
and
--dir
s
tat-by-file: Make i
t
faster and
more correct
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herla
n
d
--dirstat: D
e
sc
r
ib
e
non-obv
i
ous d
i
fference
s
relative
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
Make "
g
it notes add" more user-f
r
iendly w
h
en t
h
e
r
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log
/
pretty-
o
ptions: D
o
cu
m
ent --[no-]notes a
n
d deprecate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan Herland
b
r
anc
h
/checkout --track: Ensure
that upstre
a
m branch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Joh
a
n Herland
push
.
default
:
R
ename 'tr
a
ckin
g
' to 'upstrea
m
'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provid
e
'g
i
t
merg
e
--abor
t
' as a
sy
n
onym to
'
git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herland
cmd_merge()
:
Parse options b
e
f
ore che
c
k
i
n
g MERGE_HEA
D
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
Provide
'g
i
t
n
otes get-ref'
to eas
i
ly
re
t
rieve
c
urrent
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
ha
n
Herland
git
n
ot
e
s merge: Add testcases for mergi
n
g note
s
tre
e
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han H
e
r
l
and
git
notes merge: Add another au
t
o-resolving stra
t
egy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes
merge: --
c
o
mm
i
t should fail if u
n
derlying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List confl
i
cting notes in
notes merge
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
H
erland
g
i
t notes merge
:
M
a
nual co
n
flict resoluti
o
n, pa
r
t 2/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git
notes merge: Man
u
a
l
c
onflict resolution, part 1/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rland
Docum
e
ntation: Prelim
i
nary docs on 'git no
t
es merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git notes merg
e
: Add
a
utomatic con
f
lict resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erland
gi
t
notes merge:
H
and
l
e real, non-con
f
licting n
o
te
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Her
l
and
built
i
n/notes
.
c: Refa
c
to
r
creatio
n
of notes commits
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git n
o
t
e
s merge: Initial implementa
t
ion handling trivi
a
l
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
b
u
i
ltin/notes
.
c:
S
plit notes ref DWIMmery
i
nto a separate
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
n
o
tes
.
c: Use two n
e
w
l
i
nes (in
s
tead of
o
ne) when conca
t
enatin
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivia
l
)
t3
3
03: Ind
e
nt with tabs i
n
stead of
s
p
aces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n H
e
rla
n
d
notes
.
h/c: Propagate
c
ombine_no
t
es_fn re
t
urn value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
notes
.
h/
c
:
Allow combine_notes functions
t
o remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
note
s
.
c:
Reorder functions in pr
e
parat
i
on for ne
x
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herlan
d
n
otes
.
h:
M
ake default_notes_re
f
() available
in not
e
s API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
(trivial) notes
.
h
: Minor documentation f
i
xes
t
o co
p
y
_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erl
a
nd
notes
.
c:
Hex
i
fy SH
A
1 in
die(
)
message from init_notes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan Herland
notes: Don
'
t create
(emp
t
y) commit when removing non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Enable custom
s
c
h
emes
f
or column colors i
n
t
he graph
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Johan Herland
Make graph_nex
t
_
line() available in the graph
.
h API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herlan
d
revis
i
on
:
Turn off history si
m
plification in --ances
t
ry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
a
n Herland
revisio
n
: Fix typo in --ance
s
try
-
path error message
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
o
h
a
n Herla
n
d
Doc
u
mentatio
n
/rev-l
i
st-options
.
t
xt: E
x
plain --anc
e
s
tr
y
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herla
n
d
Documentation/r
e
v-list-options
.
txt: Fix miss
i
ng line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Johan
H
erl
a
nd
di
f
f
.
c: Ensure "index $from
.
.
$to" line contains unambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
o
han
H
e
rla
n
d
builtin-note
s
: Minor (mos
t
l
y
p
a
r
se_o
p
tions
-
related
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
Johan Herland
submodu
l
e summary: Don't
b
arf
when invoked in
an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
b
uilti
n
-no
t
es: A
d
d "copy"
s
ubcom
m
a
nd
f
or copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
l
and
builtin-notes: Misc
.
refactoring of
a
r
gc and ex
i
t value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: A
d
d -c/-C options for reu
s
ing
no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
builti
n
-
notes:
Refact
o
r handling of -F option to allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
a
n
d
builtin-notes: Deprecate the -m/
-
F options for
"git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Her
l
a
n
d
builtin-notes: Add "append" subcommand for append
i
ng
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Her
l
and
builtin-no
t
e
s
:
Ad
d
"add" subcomman
d
for
a
dding no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
builti
n
-no
t
es
:
Add --m
e
ssa
g
e
/--f
i
le aliases
for
-
m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
built
i
n-not
e
s: Add
"
list" subcommand for l
i
st
i
ng note
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herland
Doc
u
mentation: Gen
e
r
a
lize git-notes docs to 'objec
t
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Her
l
an
d
b
uiltin-
n
otes: Ad
d
"prune"
sub
c
o
mmand
f
or removin
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes
API:
p
rune_notes():
P
rune
notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
t3305: Verify that remo
v
i
ng notes tri
g
gers autom
a
tic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
a
n
Herland
builtin-
n
o
tes: Add "remove" subcomm
a
nd for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
e
r
land
Teach builtin-notes to re
m
ove empty note
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
T
e
ach n
o
t
e
s c
o
de
to prop
e
rly pr
e
serve
n
on-note
s
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
t3305: Veri
f
y that
a
ddin
g
many no
t
e
s with git-n
o
tes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
t330
1
: Verify su
c
c
e
ssful
a
nnotation of non-commi
t
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n
Herland
B
uiltin-ify git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herl
a
nd
R
e
f
a
c
t
or no
t
es concat
e
n
ation into a
flexible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Notes API:
All
o
w multipl
e
concurren
t
notes tr
e
e
s
wit
h
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herla
n
d
N
otes API: write_notes_t
r
e
e
(): Store
the
notes tree
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Not
e
s API: for_
e
ach_no
t
e(): Trave
r
se t
h
e entire notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herla
n
d
Notes API: get_no
t
e()
:
Return the note annotating t
h
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
Herland
Notes AP
I
: re
m
ove_n
o
t
e
(): Remove n
o
t
e objects from
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
H
erland
Notes API: add
_
n
ote(): Add note ob
j
ec
t
s to the internal
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API: init_no
t
es()
:
Initialize the
n
ot
e
s t
r
ee
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an Herland
Add tests for checking
c
orrect
h
andling of $GIT_NOTES_
R
E
F
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n H
e
rland
Notes
API: get_c
o
mmit_notes() -> form
a
t_note()
+ remov
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
erland
Mi
n
or cos
m
etic f
i
x
es to
notes
.
c
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-01-26
Johan Herland
b
uilti
n
-con
f
ig: Fix crash when using "-f <relati
v
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
J
o
han Her
l
and
A
dd more t
e
stca
s
es to
t
e
s
t fast
-
import of notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2009-12-07
Johan Herland
Renam
e
t9301 to t9
3
50, to
make room for more fa
s
t-import
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next