diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-17 21:37:14 -0700 |
| commit | f2b516352527c6ddf338143e4ade0ef4713f85eb (patch) | |
| tree | 1876df9a5d1726ef3182b0b11c8aa943fb12302a | |
| parent | 0c762702a061c57f1482cc7405989b9373165e40 (diff) | |
| parent | 035b5bf6431dbf8f3cde2f44b0d7ef893b95b605 (diff) | |
| download | git-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
| -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 8c1370f81..9868a0bfb 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 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=' |