diff options
| author |  J. Bruce Fields <bfields@citi.umich.edu> | 2007-01-14 19:27:28 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-01-14 19:27:28 -0500 |
| commit | 67583917e9a2a85605c1123a62c8883593e7e889 (patch) | |
| tree | 06f61d2f28e321063b8e1e206a0e418bc1ba0486 /git-rebase.sh | |
| parent | user-manual: reindent (diff) | |
| parent | Merge branch 'jc/int' (diff) | |
| download | tgif-67583917e9a2a85605c1123a62c8883593e7e889.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 828c59ce61..c8bd0f99d1 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\". |