From: Charles Bailey Date: Sat, 19 Jul 2014 16:35:16 GMT Subject: [PATCH 1/2] mergetool: don't require a work tree for --tool-help Message-ID: <1405787717-30476-1-git-send-email-charles@hashpling.org> From: Charles Bailey Signed-off-by: Charles Bailey --- You can call git difftool --tool-help outside of a work tree but not mergetool --tool-help but there's not real reason for this restriction and it can be easily relaxed by deferring the require_work_tree call until after the options have been parsed. git-mergetool.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 9a046b7..e969dd0 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -14,7 +14,6 @@ OPTIONS_SPEC= TOOL_MODE=merge . git-sh-setup . git-mergetool--lib -require_work_tree # Returns true if the mode reflects a symlink is_symlink () { @@ -372,6 +371,8 @@ prompt_after_failed_merge () { done } +require_work_tree + if test -z "$merge_tool" then # Check if a merge tool has been configured -- 2.0.2.611.g8c85416