diff --git a/Documentation/RelNotes-1.7.2.txt b/Documentation/RelNotes-1.7.2.txt index 8ed7406266..aa79f06851 100644 --- a/Documentation/RelNotes-1.7.2.txt +++ b/Documentation/RelNotes-1.7.2.txt @@ -44,9 +44,9 @@ Updates since v1.7.1 prepares to create a root commit that is not connected to any existing commit. - * "git cherry-pick" learned to pick a range of commits (e.g. "cherry-pick - A..B"); this does not have nicer sequencing control "rebase [-i]" has, - though. + * "git cherry-pick" learned to pick a range of commits + (e.g. "cherry-pick A..B" and "cherry-pick --stdin"); this does not + have nicer sequencing control "rebase [-i]" has, though. * "git cvsserver" can be told to use pserver; its password file can be stored outside the repository. @@ -74,8 +74,12 @@ Updates since v1.7.1 * Various options to "git grep" (e.g. --count, --name-only) work better with binary files. + * "git grep" learned "-Ovi" to open the files with hits in yoru editor. + * "git help -w" learned "chrome" and "chromium" browsers. + * "git log --decorate" shows commit decorations in various colours. + * "git log --follow " follows across copies (it used to only follow renames). This may make the processing more expensive. @@ -106,6 +110,8 @@ Updates since v1.7.1 * "git status -s -b" shows the current branch in the output. + * "git status" learned "--ignore-submodules" option. + * Various "gitweb" enhancements and clean-ups, including syntax highlighting, "plackup" support for instaweb, .fcgi suffix to run it as FastCGI script, etc. @@ -149,6 +155,6 @@ release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.7.1-592-gcf4403a +O=v1.7.2-rc0-60-g2927a50 echo O=$(git describe HEAD) git shortlog --no-merges HEAD ^maint ^$O diff --git a/Documentation/git.txt b/Documentation/git.txt index bec6348dab..8f0dd7fe70 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.1/git.html[documentation for release 1.7.1] +* link:v1.7.1.1/git.html[documentation for release 1.7.1.1] * release notes for + link:RelNotes-1.7.1.1.txt[1.7.1.1], link:RelNotes-1.7.1.txt[1.7.1]. * link:v1.7.0.6/git.html[documentation for release 1.7.0.6] diff --git a/git.spec.in b/git.spec.in index 9533147ff2..91c8462b7d 100644 --- a/git.spec.in +++ b/git.spec.in @@ -35,6 +35,7 @@ Requires: git-cvs = %{version}-%{release} Requires: git-arch = %{version}-%{release} Requires: git-email = %{version}-%{release} Requires: gitk = %{version}-%{release} +Requires: gitweb = %{version}-%{release} Requires: git-gui = %{version}-%{release} Obsoletes: git <= 1.5.4.2 @@ -87,6 +88,13 @@ Requires: git = %{version}-%{release}, tk >= 8.4 %description -n gitk Git revision tree visualiser ('gitk') +%package -n gitweb +Summary: Git web interface +Group: Development/Tools +Requires: git = %{version}-%{release} +%description -n gitweb +Browsing git repository on the web + %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries @@ -189,6 +197,10 @@ rm -rf $RPM_BUILD_ROOT %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } +%files -n gitweb +%defattr(-,root,root) +%{_datadir}/gitweb + %files -n perl-Git -f perl-files %defattr(-,root,root) @@ -196,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Wed Jun 30 2010 Junio C Hamano +- Add 'gitweb' subpackage. + * Fri Mar 26 2010 Ian Ward Comfort - Ship bash completion support from contrib/ in the core package.