From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Dec 2007 07:00:43 +0000 (-0800)
Subject: Merge branch 'js/pull-rebase'
X-Git-Tag: v1.5.4-rc0~105
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0ebd5d7186237663a642397214232e5fe2fba21d;p=git.git

Merge branch 'js/pull-rebase'

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

0ebd5d7186237663a642397214232e5fe2fba21d