From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Dec 2011 21:37:01 +0000 (-0800)
Subject: Merge branch 'ab/pull-rebase-config'
X-Git-Tag: v1.7.9-rc0~85
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ee740e66975adbab080301ebd364e253be3d513;p=git.git

Merge branch 'ab/pull-rebase-config'

* ab/pull-rebase-config:
  pull: introduce a pull.rebase option to enable --rebase
---

1ee740e66975adbab080301ebd364e253be3d513