From 941cab3a78a3fd3d21ba3acb3f8da3407a692015 Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Thu, 24 May 2012 13:57:26 +0000 Subject: [PATCH 1/2] Do not autosquash in case of an implied interactive rebase The option to autosquash is only used in case of an interactive rebase. When merges are preserved, rebase uses an interactive rebase internally, but in this case autosquash should still be disabled. Signed-off-by: Vincent van Ravesteijn Signed-off-by: Junio C Hamano --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-rebase.sh b/git-rebase.sh index 03f73da88..ede972332 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -165,6 +165,7 @@ run_specific_rebase () { if [ "$interactive_rebase" = implied ]; then GIT_EDITOR=: export GIT_EDITOR + autosquash= fi . git-rebase--$type } From 785ee4960c3d334cbc2b17ab74d2cebdf1b4db64 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 17 Jun 2012 14:04:15 -0700 Subject: [PATCH 2/2] Git 1.7.10.5 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.10.5.txt | 12 ++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/1.7.10.5.txt diff --git a/Documentation/RelNotes/1.7.10.5.txt b/Documentation/RelNotes/1.7.10.5.txt new file mode 100644 index 000000000..4db1770e3 --- /dev/null +++ b/Documentation/RelNotes/1.7.10.5.txt @@ -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. diff --git a/Documentation/git.txt b/Documentation/git.txt index 55e405d64..682fec567 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.10.4/git.html[documentation for release 1.7.10.4] +* 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.3.txt[1.7.10.3], link:RelNotes/1.7.10.2.txt[1.7.10.2], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 86458311a..2ccbf24f9 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.10.3 +DEF_VER=v1.7.10.5 LF=' ' diff --git a/RelNotes b/RelNotes index e6cfd0bd0..1af36eae2 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.10.4.txt \ No newline at end of file +Documentation/RelNotes/1.7.10.5.txt \ No newline at end of file