summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-03 17:27:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-03 17:27:22 (GMT)
commitf66a5bd9236b19288ad39387ec519a11d65b513d (patch)
tree4b8a6b9db432da1fd75c59c88c0aa9ecf7f083ae
parent90f7b16b3adc78d4bbabbd426fb69aa78c714f71 (diff)
parentc9a014e38e5e2c2fb73b2e971705b320d517c65c (diff)
downloadgit-f66a5bd9236b19288ad39387ec519a11d65b513d.zip
git-f66a5bd9236b19288ad39387ec519a11d65b513d.tar.gz
git-f66a5bd9236b19288ad39387ec519a11d65b513d.tar.bz2
Merge branch 'mm/readme-markdown'
Fix a few broken links in README.md and also teach rpmbuild that there is no README. * mm/readme-markdown: README.md: don't take 'commandname' literally git.spec.in: use README.md, not README
-rw-r--r--README.md7
-rw-r--r--git.spec.in2
2 files changed, 4 insertions, 5 deletions
diff --git a/README.md b/README.md
index d1ffbb6..2087748 100644
--- a/README.md
+++ b/README.md
@@ -17,11 +17,11 @@ including full documentation and Git related tools.
See [Documentation/gittutorial.txt][] to get started, then see
[Documentation/giteveryday.txt][] for a useful minimum set of commands, and
-[Documentation/git-commandname.txt][] for documentation of each command.
+Documentation/git-*commandname*.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
-documentation of each command with "man git-commandname" or "git help
-commandname".
+documentation of each command with "man git-*commandname*" or "git help
+*commandname*".
CVS users may also want to read [Documentation/gitcvs-migration.txt][]
("man gitcvs-migration" or "git help cvs-migration" if git is
@@ -57,6 +57,5 @@ and the name as (depending on your mood):
[INSTALL]: INSTALL
[Documentation/gittutorial.txt]: Documentation/gittutorial.txt
[Documentation/giteveryday.txt]: Documentation/giteveryday.txt
-[Documentation/git-commandname.txt]: Documentation/git-commandname.txt
[Documentation/gitcvs-migration.txt]: Documentation/gitcvs-migration.txt
[Documentation/SubmittingPatches]: Documentation/SubmittingPatches
diff --git a/git.spec.in b/git.spec.in
index d61d537..bfd1cfb 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -146,7 +146,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f bin-man-doc-files
%defattr(-,root,root)
%{_datadir}/git-core/
-%doc README COPYING Documentation/*.txt
+%doc README.md COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html Documentation/howto}
%{!?_without_docs: %doc Documentation/technical}
%{_sysconfdir}/bash_completion.d