summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-17 21:37:14 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-17 21:37:14 -0700
commitf2b516352527c6ddf338143e4ade0ef4713f85eb (patch)
tree1876df9a5d1726ef3182b0b11c8aa943fb12302a /git-pull.sh
parent0c762702a061c57f1482cc7405989b9373165e40 (diff)
parent035b5bf6431dbf8f3cde2f44b0d7ef893b95b605 (diff)
downloadgit-f2b516352527c6ddf338143e4ade0ef4713f85eb.tar.gz
Merge branch 'jk/pull-rebase-with-work-tree'
* jk/pull-rebase-with-work-tree: pull,rebase: handle GIT_WORK_TREE better Conflicts: git-pull.sh
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 8c1370f81b..9868a0bfb4 100755
--- 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