Skip to content

Commit f66a5bd

Browse files
committed
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
2 parents 90f7b16 + c9a014e commit f66a5bd

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ including full documentation and Git related tools.
1717

1818
See [Documentation/gittutorial.txt][] to get started, then see
1919
[Documentation/giteveryday.txt][] for a useful minimum set of commands, and
20-
[Documentation/git-commandname.txt][] for documentation of each command.
20+
Documentation/git-*commandname*.txt for documentation of each command.
2121
If git has been correctly installed, then the tutorial can also be
2222
read with "man gittutorial" or "git help tutorial", and the
23-
documentation of each command with "man git-commandname" or "git help
24-
commandname".
23+
documentation of each command with "man git-*commandname*" or "git help
24+
*commandname*".
2525

2626
CVS users may also want to read [Documentation/gitcvs-migration.txt][]
2727
("man gitcvs-migration" or "git help cvs-migration" if git is
@@ -57,6 +57,5 @@ and the name as (depending on your mood):
5757
[INSTALL]: INSTALL
5858
[Documentation/gittutorial.txt]: Documentation/gittutorial.txt
5959
[Documentation/giteveryday.txt]: Documentation/giteveryday.txt
60-
[Documentation/git-commandname.txt]: Documentation/git-commandname.txt
6160
[Documentation/gitcvs-migration.txt]: Documentation/gitcvs-migration.txt
6261
[Documentation/SubmittingPatches]: Documentation/SubmittingPatches

git.spec.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ rm -rf $RPM_BUILD_ROOT
146146
%files -f bin-man-doc-files
147147
%defattr(-,root,root)
148148
%{_datadir}/git-core/
149-
%doc README COPYING Documentation/*.txt
149+
%doc README.md COPYING Documentation/*.txt
150150
%{!?_without_docs: %doc Documentation/*.html Documentation/howto}
151151
%{!?_without_docs: %doc Documentation/technical}
152152
%{_sysconfdir}/bash_completion.d

0 commit comments

Comments
 (0)