Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
mergetool: don't require a work tree for --tool-help
author
Charles Bailey
<cbailey32@bloomberg.net>
Sat, 11 Oct 2014 08:39:37 +0000
(
01:39
-0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 15 Oct 2014 21:12:20 +0000
(14:12 -0700)
Signed-off-by: Charles Bailey <cbailey32@bloomberg.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(from parent 1:
1c7e2d2
)
diff --git
a/git-mergetool.sh
b/git-mergetool.sh
index 0ff6566a0eff8819023254d39c26ed45670b9a7b..8098d2dc076a0ff6044e5c4cadbb39a4a32483c5 100755
(executable)
--- a/
git-mergetool.sh
+++ b/
git-mergetool.sh
@@
-10,11
+10,11
@@
USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
SUBDIRECTORY_OK=Yes
+NONGIT_OK=Yes
OPTIONS_SPEC=
TOOL_MODE=merge
. git-sh-setup
. git-mergetool--lib
-require_work_tree
# Returns true if the mode reflects a symlink
is_symlink () {
@@
-377,6
+377,9
@@
prompt_after_failed_merge () {
done
}
+git_dir_init
+require_work_tree
+
if test -z "$merge_tool"
then
merge_tool=$(get_merge_tool "$merge_tool") || exit