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

Junio C Hamano committed Oct 17, 2011 at 21:37 UTC f2b516352527c6ddf338143e4ade0ef4713f85eb

No changes.