aboutsummaryrefslogtreecommitdiff
path: root/git-rebase.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-rebase.sh
parent0c762702a061c57f1482cc7405989b9373165e40 (diff)
parent035b5bf6431dbf8f3cde2f44b0d7ef893b95b605 (diff)
downloadgit-f2b516352527c6ddf338143e4ade0ef4713f85eb.tar.gz
git-f2b516352527c6ddf338143e4ade0ef4713f85eb.tar.xz
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-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 6759702c5..00ca7b99f 100755
--- 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='