Oded Shimon <ods15@xxxxxxxxxxxxxxxx> writes: > 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 <ods15@xxxxxxxxxxxxxxxx> Hmm. > 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" && As the format-patch invocation is already multi-line, you probably would want to use a continuation line with "\" to keep the line length shorter. We need to protect ourselves from crazy people, so regrettably something like this patch is unavoidable, albeit unsightly. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html