Merge branch 'jk/pull-rebase-with-work-tree' into maint

gitster · gitster · commit 0814d6e554c4 · 2011-11-01T16:11:00.000-07:00
* jk/pull-rebase-with-work-tree:
  pull,rebase: handle GIT_WORK_TREE better

Conflicts:
	git-pull.sh
diff --git 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
 
 
diff --git a/git-rebase.sh b/git-rebase.sh
@@ -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='

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ skip! skip current patch and continue`
`63`	`63`	`"`
`64`	`64`	`. git-sh-setup`
`65`	`65`	`set_reflog_action rebase`
`66`		`-require_work_tree`
	`66`	`+require_work_tree_exists`
`67`	`67`	`cd_to_toplevel`
`68`	`68`
`69`	`69`	`LF='`