diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-12 23:52:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-13 03:54:38 +0300 |
| commit | 533b70390e540de4e0faed4823ee561c8368e5ec (patch) | |
| tree | a8daab8c94e77c77cb5a8cdba6a071d5cfb3f2a8 /git-rebase.sh | |
| parent | 514c09fdcfef6385f1a61ee52344794356c99986 (diff) | |
Allow whole-tree operations to be started from a subdirectory
This updates five commands (merge, pull, rebase, revert and cherry-pick)
so that they can be started from a subdirectory.
This may not actually be what we want to do. These commands are
inherently whole-tree operations, and an inexperienced user may
mistakenly expect a "git pull" from a subdirectory would merge
only the subdirectory the command started from.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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\". |