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-merge.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-merge.sh')
| -rwxr-xr-x | git-merge.sh | 4 |
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=' ' |