Merge branch 'js/pull-rebase'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Dec 2007 07:00:43 +0000 (23:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Dec 2007 07:00:43 +0000 (23:00 -0800)
* js/pull-rebase:
  Teach 'git pull' about --rebase


Trivial merge