diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-03 10:27:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-03 10:27:22 -0700 |
| commit | f66a5bd9236b19288ad39387ec519a11d65b513d (patch) | |
| tree | 4b8a6b9db432da1fd75c59c88c0aa9ecf7f083ae | |
| parent | 90f7b16b3adc78d4bbabbd426fb69aa78c714f71 (diff) | |
| parent | c9a014e38e5e2c2fb73b2e971705b320d517c65c (diff) | |
| download | git-f66a5bd9236b19288ad39387ec519a11d65b513d.tar.gz | |
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.md | 7 | ||||
| -rw-r--r-- | git.spec.in | 2 |
2 files changed, 4 insertions, 5 deletions
@@ -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 d61d537ef0..bfd1cfb63f 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 |