diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-17 14:07:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-17 14:07:15 -0700 |
| commit | 0ce2e396ee9fb0fa07e8381b338e49859dbf03db (patch) | |
| tree | e7dcf9faae6b66ab5f98eef098d16f29e2d1ff67 | |
| parent | Sync with 1.7.10.5 (diff) | |
| download | tgif-0ce2e396ee9fb0fa07e8381b338e49859dbf03db.tar.xz | |
Git 1.7.11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/1.7.11.txt | 9 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt index a9fa44919f..15b954ca4b 100644 --- a/Documentation/RelNotes/1.7.11.txt +++ b/Documentation/RelNotes/1.7.11.txt @@ -130,15 +130,6 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance releases are contained in this release (see release notes to them for details). - * "git fast-export" did not give a readable error message when the - same mark erroneously appeared twice in the --import-marks input. - (merge 43bc230 js/maint-fast-export-mark-error later to maint). - - * "git rebase -p" used to pay attention to rebase.autosquash which - was wrong. "git rebase -p -i" should, but "git rebase -p" by - itself should not. - (cherry-pick 8a6dae1 vr/rebase-autosquash-does-not-imply-i later to maint). - * "git submodule init" used to report "registered for path ..." even for submodules that were registered earlier. (cherry-pick c1c259e jl/submodule-report-new-path-once later to maint). diff --git a/Documentation/git.txt b/Documentation/git.txt index 682fec5677..59ce6ac241 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,6 +44,11 @@ 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.11/git.html[documentation for release 1.7.11] + +* release notes for + link:RelNotes/1.7.11.txt[1.7.11]. + * link:v1.7.10.5/git.html[documentation for release 1.7.10.5] * release notes for diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 728a5d4d29..43d564920d 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.11-rc3 +DEF_VER=v1.7.11 LF=' ' |