global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-20 14:50:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync with v1.7.11

Browse Source 
# By Junio C Hamano (2) and Vincent van Ravesteijn (1)
* master:
  Git 1.7.11
  Git 1.7.10.5
  Do not autosquash in case of an implied interactive rebase
This commit is contained in:
Junio C Hamano
2012-06-17 14:07:46 -07:00
parent b465d9982e 0ce2e396ee
commit 4f8abc6d28
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/RelNotes/1.7.10.5.txt Normal file
View File

@@ -0,0 +1,12 @@
Git v1.7.10.5 Release Notes
===========================
Fixes since v1.7.10.4
---------------------
* "git fast-export" did not give a readable error message when the
same mark erroneously appeared twice in the --import-marks input.
* "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.

9
Documentation/RelNotes/1.7.11.txt
View File

@@ -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 releases are contained in this release (see release notes to them for
details). 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 ..." * "git submodule init" used to report "registered for path ..."
even for submodules that were registered earlier. even for submodules that were registered earlier.
(cherry-pick c1c259e jl/submodule-report-new-path-once later to maint). (cherry-pick c1c259e jl/submodule-report-new-path-once later to maint).

8
Documentation/git.txt
View File

@@ -44,9 +44,15 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: Documentation for older releases are available here:
* link:v1.7.10.4/git.html[documentation for release 1.7.10.4] * link:v1.7.11/git.html[documentation for release 1.7.11]
* release notes for * 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
link:RelNotes/1.7.10.5.txt[1.7.10.5],
link:RelNotes/1.7.10.4.txt[1.7.10.4], link:RelNotes/1.7.10.4.txt[1.7.10.4],
link:RelNotes/1.7.10.3.txt[1.7.10.3], link:RelNotes/1.7.10.3.txt[1.7.10.3],
link:RelNotes/1.7.10.2.txt[1.7.10.2], link:RelNotes/1.7.10.2.txt[1.7.10.2],

2
GIT-VERSION-GEN
View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.7.11-rc3 DEF_VER=v1.7.11
LF=' LF='
' '