Skip to content

Commit

Permalink
Git 1.7.11
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Jun 17, 2012
1 parent a890c99 commit 0ce2e39
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
9 changes: 0 additions & 9 deletions Documentation/RelNotes/1.7.11.txt
Expand Up @@ -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).
Expand Down
5 changes: 5 additions & 0 deletions Documentation/git.txt
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 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='
'
Expand Down

0 comments on commit 0ce2e39

Please sign in to comment.