diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-01 16:11:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-01 16:11:00 -0700 |
| commit | 0814d6e554c45636f41856cc2204abe2f661560c (patch) | |
| tree | 944fb8c2fdbd40dcef36a1175b4fc097ecddd8f2 | |
| parent | eee947fb95dfa160d924824518dbfcb350c10aa5 (diff) | |
| parent | 035b5bf6431dbf8f3cde2f44b0d7ef893b95b605 (diff) | |
| download | git-0814d6e554c45636f41856cc2204abe2f661560c.tar.gz | |
Merge branch 'jk/pull-rebase-with-work-tree' into maint
* jk/pull-rebase-with-work-tree:
pull,rebase: handle GIT_WORK_TREE better
Conflicts:
git-pull.sh
| -rwxr-xr-x | git-pull.sh | 2 | ||||
| -rwxr-xr-x | git-rebase.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh index 63da37bcc2..902fc4adb4 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 diff --git a/git-rebase.sh b/git-rebase.sh index 6759702c57..00ca7b99fe 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=' |