scripts/quilt-mail: fix merge

diff --git a/scripts/quilt-mail b/scripts/quilt-mail
index a6f2e3905711c3df795401c303720b80de741dcb..420cc5383e062a885dcd7aaebc928c1e2395e31b 100755 (executable)
--- a/scripts/quilt-mail
+++ b/scripts/quilt-mail
@@ -155,7 +155,8 @@ chmod 755 ${TMP_DIR}/send_it_off
 # Push a version of the patches out to the world in a git tree
 cd ${TMP_TREE}
 git checkout linux-${ROOT_VERSION}.y
-git merge -q temp_branch^
+#git merge -q temp_branch^
+git merge -q temp_branch
 echo "git push --force gitolite@ra.kernel.org:/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-${ROOT_VERSION}.y"
 git push --force gitolite@ra.kernel.org:/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-${ROOT_VERSION}.y