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
13 years ago · f2b5163525
2 changed files with 2 additions and 2 deletions
--- a/git-pull.sh
+++ b/git-pull.sh
@ -11,7 +11,7 @@ OPTIONS_SPEC=
				@@ -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


--- a/git-rebase.sh
+++ b/git-rebase.sh
@ -63,7 +63,7 @@ skip!              skip current patch and continue
				@@ -63,7 +63,7 @@ skip!              skip current patch and continue
 "
 . git-sh-setup
 set_reflog_action rebase
-require_work_tree
+require_work_tree_exists
 cd_to_toplevel

 LF='