diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-01-14 11:41:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-14 11:41:36 -0800 |
| commit | 3681d40b965258f7559235642c75f2117476765e (patch) | |
| tree | 61247899bdc5cd8a5109a568251e6ab3ffd1cf44 /git-rebase.sh | |
| parent | Remove read_or_die in favor of better error messages. (diff) | |
| parent | Allow whole-tree operations to be started from a subdirectory (diff) | |
| download | tgif-3681d40b965258f7559235642c75f2117476765e.tar.xz | |
Merge branch 'jc/subdir'
* jc/subdir:
Allow whole-tree operations to be started from a subdirectory
Use cd_to_toplevel in scripts that implement it by hand.
Define cd_to_toplevel shell function in git-sh-setup
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 98f9558145..c8bd0f99d1 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -27,9 +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\". |