diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-18 06:37:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-18 06:37:14 +0200 |
| commit | f2b516352527c6ddf338143e4ade0ef4713f85eb (patch) | |
| tree | 1876df9a5d1726ef3182b0b11c8aa943fb12302a /git-pull.sh | |
| parent | Merge branch 'jk/config-test-cleanup' (diff) | |
| parent | pull,rebase: handle GIT_WORK_TREE better (diff) | |
| download | git-f2b516352527c6ddf338143e4ade0ef4713f85eb.tar.xz git-f2b516352527c6ddf338143e4ade0ef4713f85eb.zip | |
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-pull.sh')
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index 8c1370f81b..9868a0bfb4 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 |