From 5b9cdfb968d4c686c08cdb6af38365442262dd1a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 17 Jun 2016 20:33:50 -0700 Subject: [PATCH] scripts/quilt-mail: fix merge --- scripts/quilt-mail | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/quilt-mail b/scripts/quilt-mail index a6f2e390571..420cc5383e0 100755 --- 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 -- 2.47.3