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
Junio C Hamano committed
Nov 1, 2011 at 16:11 UTC
0814d6e554c45636f41856cc2204abe2f661560c
No changes.