summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-12 12:52:03 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-12 16:54:38 -0800
commit533b70390e540de4e0faed4823ee561c8368e5ec (patch)
treea8daab8c94e77c77cb5a8cdba6a071d5cfb3f2a8 /git-merge.sh
parent514c09fdcfef6385f1a61ee52344794356c99986 (diff)
downloadgit-533b70390e540de4e0faed4823ee561c8368e5ec.tar.gz
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-merge.sh')
-rwxr-xr-xgit-merge.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 3eef048efc..7de83dc76c 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -5,12 +5,14 @@
USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'
+SUBDIRECTORY_OK=Yes
. git-sh-setup
set_reflog_action "merge $*"
require_work_tree
+cd_to_toplevel
test -z "$(git ls-files -u)" ||
- die "You are in a middle of conflicted merge."
+ die "You are in the middle of a conflicted merge."
LF='
'