Merge branch 'js/pull-rebase'
commit0ebd5d7186237663a642397214232e5fe2fba21d
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Dec 2007 07:00:43 +0000 (2 23:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Dec 2007 07:00:43 +0000 (2 23:00 -0800)
treec94682d4abf341bdc6df2785b73faa6e796ff045
parent5b0d61637c21d80bcc781aa135ed1959326713bb
parentcd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5
Merge branch 'js/pull-rebase'

* js/pull-rebase:
  Teach 'git pull' about --rebase