diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-14 15:38:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-14 15:47:45 -0700 |
| commit | 0e2d57fd50f61e668be3180bc8f25991ea88aa8c (patch) | |
| tree | 2d90d25ecbe794492f0fb267f31af8a1f646327d | |
| parent | d973dc01cc904ae046f6b40911aaf340c04cfdc7 (diff) | |
| download | git-0e2d57fd50f61e668be3180bc8f25991ea88aa8c.tar.gz git-0e2d57fd50f61e668be3180bc8f25991ea88aa8c.tar.xz | |
Git 1.7.10-rc1v1.7.10-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/1.7.10.txt | 14 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt index 6286485bd..540ce38c4 100644 --- a/Documentation/RelNotes/1.7.10.txt +++ b/Documentation/RelNotes/1.7.10.txt @@ -119,8 +119,8 @@ UI, Workflows & Features * Project search in "gitweb" shows the substring that matched in the project name and description highlighted. - * A new script "diffall" is added to contrib/; it drives an external - an external tool to perform a directory diff of two Git revisions + * A new script "diffall" is added to contrib/; it drives an + external tool to perform a directory diff of two Git revisions in one go, unlike "difftool" that compares one file at a time. Foreign Interface @@ -180,17 +180,25 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance releases are contained in this release (see release notes to them for details). + * The "remaining" subcommand to "git rerere" was not documented. + (merge 3e7a1df ph/rerere-doc later to maint). + * "git tag -s" honored "gpg.program" configuration variable since 1.7.9, but "git tag -v" and "git verify-tag" didn't. (merge a2c2506 az/verify-tag-use-gpg-config later to maint). + * When "git config" diagnoses an error in a configuration file and + shows the line number for the offending line, it miscounted if the + error was at the end of line. + (merge 4b34059 ms/maint-config-error-at-eol-linecount later to maint). + * "gitweb" used to drop warnings in the log file when "heads" view is accessed in a repository whose HEAD does not point at a valid branch. --- exec >/var/tmp/1 -O=v1.7.10-rc0-40-g57cec0a +O=v1.7.10-rc0-50-gd973dc0 echo O=$(git describe) git log --first-parent --oneline ^maint $O.. echo diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index f28ceef12..1c06cec04 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.10-rc0 +DEF_VER=v1.7.10-rc1 LF=' ' |