xdiff: PATIENCE/HISTOGRAM are not independent option bits

diff --git a/git-pull.sh b/git-pull.sh
index 8c1370f81bfa95832de99d78aa3bee4f763b821a..9868a0bfb478707b361f664a252870b3d1939138 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -11,7 +11,7 @@ OPTIONS_SPEC=
 . git-sh-setup
 . git-sh-i18n
 set_reflog_action "pull${1+ $*}"
-require_work_tree
+require_work_tree_exists
 cd_to_toplevel