X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=c8bd0f99d1306cd311eaf45f73581efc8bb0e512;hb=b181d57ff40d94799a595045718039dc9d4320f7;hp=828c59ce61a8317f23ba9113e4de6e09a58e70ce;hpb=eff73751bb94b0241fd2204effb8680fe9973cbf;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index 828c59ce6..c8bd0f99d 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -27,8 +27,12 @@ Example: git-rebase master~1 topic / --> / D---E---F---G master D---E---F---G master ' + +SUBDIRECTORY_OK=Yes . git-sh-setup set_reflog_action rebase +require_work_tree +cd_to_toplevel RESOLVEMSG=" When you have resolved this problem run \"git rebase --continue\".