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-svn: Warn about changing default for --prefix in Git v2.0
2013-10-12
J
ohan Herland
git-svn: Warn
a
bout changing d
e
fault for -
-
p
r
e
f
ix
in
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-10-12
Jo
h
an Herland
Documentati
o
n
/
git-svn: Promote t
h
e use of --prefix
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Jo
h
a
n
Herland
t3200:
A
d
d
test demonstrating minor
regressi
o
n in 41c21
f
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan
Her
l
and
Refer t
o
branch
.
<name
>
.
remote/merge
w
hen documenting
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t3200: Minor fix
w
hen
p
r
eparing for track
i
ng failure
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-09-09
Johan Herla
n
d
t2024:
F
ix &&-c
h
ai
n
i
n
g and a coup
l
e of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan
H
erland
Move create_not
e
s_commit() from notes-merge
.
c
into
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan
Herland
Move copy_n
o
te_for_rewr
i
te + friends from bui
l
tin/notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-06-12
Johan H
e
rland
finish_cop
y
_notes_for
_
rewrite(): Let caller provide
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan
Herland
g
l
o
ssary: Update and rephras
e
the d
e
finition of a remote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n
Herland
bran
c
h
.
c: Vali
d
ate tracki
n
g branc
h
e
s with refspec
s
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herlan
d
t9114
.
2:
Don't use --
t
r
a
ck option against "svn-r
e
mote
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan Herl
a
nd
t7201
.
24
:
Add
refspec to keep --track working
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
J
ohan
H
erla
n
d
t
3200
.
39: tracking setup shou
l
d fail if
t
here
is no
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Joh
a
n Herland
checkout
:
U
s
e remote refspecs when DW
I
Mming track
i
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Jo
h
a
n Herland
t2
0
24: Show
failure to use refsp
e
c
w
hen DWIMming
r
em
o
te
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2013-04-21
Johan Herla
n
d
t20
2
4
:
A
dd tests
v
erifying current
D
W
I
M behavior of
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Joha
n
He
r
land
git symbol
i
c
-
ref -
-
delete $sy
m
ref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
J
o
han Her
l
and
Fix
f
a
i
lure
to delete a packed ref throu
g
h a
symref
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-10-21
Johan
H
erland
t14
0
0-update-ref: Add test verifyi
n
g
bug with symrefs
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Johan Herland
notes-merg
e
: Don't rem
o
ve
.
git/NOTES_MERGE_WORKT
R
EE
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2012-03-15
Joh
a
n Herl
a
nd
notes-merge:
use ope
n
dir/readdir instead of u
s
ing 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
t3310: ill
u
s
trate failure to "notes merge --commit
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
ohan
Herland
fast-import: Fix in
c
orre
c
t
f
anout
l
evel when modifying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
J
oha
n
Herland
t9301: Add 2
n
d testcase e
x
po
s
i
n
g bu
g
s
i
n
fast-i
m
p
o
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-11-29
Jo
h
a
n Herland
t930
1
: Fix testcase cov
e
ri
n
g up
a
bug in fast-impo
r
t
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-05-13
J
o
han Herland
t5400: Fi
x
a couple of typos
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herland
Mark dirstat error message
s
for translat
i
on
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
I
mprove error handling when parsing dirs
t
a
t
para
m
eter
s
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
h
a
n
Herland
New --dirs
t
a
t
=lines m
o
de, doing
d
ir
s
t
a
t anal
y
sis based
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan Herla
n
d
Allow specifying
-
-dirstat
cut-
o
f
f
percen
t
age as a
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
han Herland
Add conf
i
g va
r
iable
f
or
specifying def
a
ult
-
-
d
i
rs
t
at
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan He
r
l
a
nd
Re
f
actor --dirstat parsing; deprecate --cu
m
ula
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Johan
Herland
Make --d
i
r
s
tat
=
0 o
u
tput d
i
rectori
e
s that contribu
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-29
Joha
n
Herland
Add several te
s
tcases for --dirstat
a
nd
fr
i
ends
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-12
Johan H
e
rla
n
d
--
d
i
rstat: In case of r
e
name
s
, use
t
arge
t
fil
e
name
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
Teach --dirstat not to complete
l
y
igno
r
e
rearranged
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-file: M
a
ke it fa
s
ter and more
corre
c
t
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rland
--di
r
s
t
at: Describe no
n
-obvious
d
iff
e
rences rela
t
ive
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan
Herland
Make "git
notes
a
dd" more user
-
fri
e
ndly when there
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-03-30
Johan Herland
log/pretty
-
o
ptions: Document
-
-[no-]notes and depre
c
a
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-17
Johan
H
erland
branch/c
h
eckout
-
-
track:
Ensure that
upstream br
a
nch
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2011-02-16
Johan He
r
land
pus
h
.
d
e
fault: Rename 't
r
acking
'
to 'ups
t
ream'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Pro
v
ide 'git merge --abort'
as a syn
o
nym to 'git reset
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herla
n
d
cmd
_
m
erge(): Parse
o
ptions
be
f
or
e
c
heck
i
ng MER
G
E_
H
EAD
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git not
e
s get-
r
ef'
to e
a
s
i
ly retrieve current
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
e
r
land
g
it note
s
merge
:
Add testcases
for me
r
ging notes trees
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git not
e
s m
e
r
g
e: Add anothe
r
auto-resolving strategy
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
e
s merg
e
: --commit should fail if under
l
ying
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
git notes merge
:
List c
o
nflicting
n
o
t
e
s
in notes mer
g
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
git n
o
tes merge: Manual
conflict resolution, part
2
/2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git no
t
es merge
:
M
a
n
u
al
co
n
fl
i
ct r
e
solution, part 1/
2
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
oh
a
n
H
erl
a
nd
Documentation: Prelimi
n
ary docs
o
n '
g
i
t
n
otes merge'
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
gi
t
notes merge: Ad
d
aut
o
matic co
n
fli
c
t resolvers
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
git notes mer
g
e
: Handle real, no
n
-c
o
nf
l
icting
n
o
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
b
u
iltin/notes
.
c:
R
efactor creation of notes commi
t
s
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
git
n
otes
m
e
r
ge: Initia
l
implemen
t
ation ha
n
dlin
g
t
rivial
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
builtin/no
t
es
.
c: Split notes
r
e
f DWIM
m
ery into a separa
t
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
n
otes
.
c
:
Use two newlin
e
s (instead of one) when con
c
atenat
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
(
t
ri
v
ial) t3303: Indent w
i
th ta
b
s
instead of spaces
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
notes
.
h/c: Propagate c
o
m
bine_notes_fn r
e
tur
n
value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan
H
erl
a
nd
notes
.
h/c:
Allow co
m
bine_notes
f
un
c
tion
s
to remove
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n He
r
l
a
n
d
notes
.
c: Reorder functions
in prepara
t
ion for next
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
J
oh
a
n Herlan
d
notes
.
h
: Make defaul
t
_no
t
e
s
_ref()
available in notes API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
(trivial)
n
o
tes
.
h:
Minor documentation fix
e
s
t
o
co
p
y_n
o
tes()
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
not
e
s
.
c:
H
exify SHA1 in
die(
)
message from in
i
t_notes
(
)
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-08-31
Johan H
e
r
land
n
o
tes: Don't create (empty) commit when r
e
moving non
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n Herland
Enable cus
t
om
sc
h
emes for column colors
in the graph
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-07-13
Joh
a
n Herland
Make graph_next_l
i
ne(
)
available i
n
the g
r
aph
.
h
API
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
re
v
ision: Tur
n
off history simpl
i
fication in --ancestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
J
ohan Herland
r
e
visio
n
:
Fi
x
typo in -
-
ancestr
y
-
pa
t
h err
o
r m
e
s
sa
g
e
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan Herland
D
o
cum
e
ntation/rev-
l
ist-options
.
txt: Explain
--
a
ncestry
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-06
Johan
Herland
Docum
e
nta
t
ion/rev
-
list-options
.
txt: Fix mis
s
ing line
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-06-01
Jo
h
an He
r
land
diff
.
c: En
s
ure "index $fro
m
.
.
$to" l
i
ne con
t
ains
u
n
ambiguous
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-25
J
ohan Herland
bui
l
t
i
n-notes: M
i
nor (mostly
parse_options-r
e
lated
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-17
J
ohan He
r
land
submodu
l
e summary: Don't ba
r
f when invoked
i
n an empty
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Add
"
c
o
py" su
b
command
f
or copying notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Herland
bu
i
lti
n
-notes
:
Misc
.
refact
o
ri
n
g of argc and exit value
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
H
er
l
and
built
i
n-notes
:
Add -c
/
-C o
p
tions
f
or reu
s
ing no
t
es
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
builtin-notes: Refactor handling
of
-
F
option
t
o allow
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
r
land
builti
n
-
n
otes
:
Deprecate the -m/-F options for
"
git
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
bu
i
lt
i
n-
n
otes:
Add "appen
d
"
s
ubcommand for appending
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joha
n
H
erland
built
i
n-not
e
s:
Add "ad
d
" subcommand
for a
d
ding notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
built
i
n-note
s
: A
d
d --message/--file alias
e
s for -m
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan
Herla
n
d
builtin-notes: Add
"
list" subcom
m
and for listi
n
g not
e
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan He
r
land
Documentation
:
Gen
e
rali
z
e git-n
o
tes docs to 'objects
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herl
a
nd
builtin-no
t
es: Add "prun
e
"
subcommand for removing
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Jo
h
an
H
erland
Note
s
API:
p
rune_notes():
P
run
e
notes that belong to
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
ohan Her
l
and
t3305: Verify that removin
g
n
o
tes
t
rig
g
e
rs automatic
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
builtin-notes: Add "remove
"
subcommand
for r
e
m
o
vi
n
g
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han
Herland
Teac
h
bu
i
l
t
in
-
n
o
t
es to remove empty notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Teach
n
otes code to properly preserve
non-notes
i
n
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
t3305:
V
erify that ad
d
ing man
y
note
s
with g
i
t-no
t
es
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
h
an Herla
n
d
t3301: Verify successful anno
t
ation of
non-co
m
mits
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herlan
d
Builtin-ify git-notes
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan H
e
rland
Refactor
n
otes concatenation into
a
flexible interface
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Not
e
s API: Allow
multip
l
e conc
u
rrent notes t
r
ees with
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
J
o
han Herlan
d
Notes API: wri
t
e_note
s
_tree(
)
:
S
tore the notes t
r
ee
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Johan Herland
Notes
A
PI:
for_eac
h
_note(
)
: Traverse t
h
e en
t
i
re notes
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
2010-02-14
Joh
a
n Herland
Notes API
:
get_note():
R
eturn the note an
n
otatin
g
the
.
.
.
Signed-off-by: Johan Herland <
johan@herland.net
>
commit
|
commitdiff
|
tree
next