diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-02-05 19:38:58 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-02-05 19:38:58 -0800 |
commit | 919ab6429aab9af44feea0768feef80f3092e9d3 (patch) | |
tree | 34a6e799b49b5c4b3f3f00a3e86148e8af203c72 | |
parent | c7893501e879ebb541a55e5633f7e0f1729407cb (diff) | |
parent | ab2fdb3b62589477bde0cd0af8239bee510c3488 (diff) | |
download | git-919ab6429aab9af44feea0768feef80f3092e9d3.tar.gz git-919ab6429aab9af44feea0768feef80f3092e9d3.tar.xz |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
Fixed broken git help -w when installing from RPM
-rw-r--r-- | git.spec.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git.spec.in b/git.spec.in index 069ace050..4be0834f0 100644 --- a/git.spec.in +++ b/git.spec.in @@ -97,7 +97,7 @@ BuildRequires: perl(Error) %description -n perl-Git Perl interface to Git -%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-core-%{version} +%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-%{version} %prep %setup -q @@ -190,6 +190,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Mon Feb 04 2009 David J. Mellor <dmellor@whistlingcat.com> +- fixed broken git help -w after renaming the git-core package to git. + * Fri Sep 12 2008 Quy Tonthat <qtonthat@gmail.com> - move git-cvsserver to bindir. |