On Wed, Sep 08, 2010 at 04:54:05PM +0300, Oded Shimon wrote: > --- > 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 Hi. I may have rudely just sent a patch without explaining anything, I thought the patch was self explanitory. I'm not sure on the expected procedure here for sending patches. When using "git rebase", when "diff.noprefix" is set to true in git-config, then all the rebases mess up because they get the directory path wrong. As far as I can tell, my patch fixes this, with no side-effects that I can think of. Can anyone comment on the patch? Can it be pushed upstream? - ods15 -- 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