From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oded Shimon Subject: [PATCH] Add --src/dst-prefix to git-formt-patch in git-rebase.sh Date: Thu, 9 Sep 2010 11:07:05 +0300 Message-ID: <1284019625-14096-1-git-send-email-ods15@ods15.dyndns.org> References: <1283954045-8326-1-git-send-email-ods15@ods15.dyndns.org> To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Sep 09 10:07:18 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OtcA7-00065a-Oa for gcvg-git-2@lo.gmane.org; Thu, 09 Sep 2010 10:07:16 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752743Ab0IIIHK (ORCPT ); Thu, 9 Sep 2010 04:07:10 -0400 Received: from bzq-79-177-53-38.red.bezeqint.net ([79.177.53.38]:44528 "EHLO ods15.dyndns.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751311Ab0IIIHH (ORCPT ); Thu, 9 Sep 2010 04:07:07 -0400 Received: from ods15 by ods15.dyndns.org with local (Exim 4.71) (envelope-from ) id 1Otc9x-0003fu-4F for git@vger.kernel.org; Thu, 09 Sep 2010 11:07:05 +0300 X-Mailer: git-send-email 1.6.4.4 In-Reply-To: <1283954045-8326-1-git-send-email-ods15@ods15.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: For the case of "diff.noprefix" in git-config, git-format-patch should still output diff with standard prefixes for git-am Signed-off-by: Oded Shimon --- git-rebase.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 7508463..e83a0cf 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -565,7 +565,7 @@ fi if test -z "$do_merge" then - git format-patch -k --stdout --full-index --ignore-if-in-upstream \ + git format-patch -k --stdout --full-index --ignore-if-in-upstream --src-prefix=a/ --dst-prefix=b/ \ --no-renames $root_flag "$revisions" | git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" && move_to_original_branch -- 1.6.4.4