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-merge.sh | |
| parent | e6e2bd6201d32342df7a713c847161ab296885ea (diff) | |
| parent | 533b70390e540de4e0faed4823ee561c8368e5ec (diff) | |
| download | git-3681d40b965258f7559235642c75f2117476765e.tar.gz git-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-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 3eef048ef..7de83dc76 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=' ' |