Code

Merge branch 'jk/pull-rebase-with-work-tree' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 23:11:00 +0000 (16:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 23:11:00 +0000 (16:11 -0700)
commit0814d6e554c45636f41856cc2204abe2f661560c
tree944fb8c2fdbd40dcef36a1175b4fc097ecddd8f2
parenteee947fb95dfa160d924824518dbfcb350c10aa5
parent035b5bf6431dbf8f3cde2f44b0d7ef893b95b605
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
git-pull.sh
git-rebase.sh