Merge branch 'jk/startup-info' into maint

diff --git a/git.spec.in b/git.spec.in
index d61d537ef0cbdfa9d4a719ca622e148bbe436fd1..bfd1cfb63fa4c883af60d5086f66709965d4ec67 100644 (file)
--- 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