From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Sep 2013 21:57:49 +0000 (-0700)
Subject: Merge branch 'sh/pull-rebase-preserve'
X-Git-Tag: v1.8.5-rc0~155
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6026f68652b6f220ce12c161fe8ac3e44a1b5b5a;p=git-core%2Fgit.git

Merge branch 'sh/pull-rebase-preserve'

"git pull --rebase" always flattened the history; pull.rebase can
now be set to "preserve" to invoke "rebase --preserve-merges".

* sh/pull-rebase-preserve:
  pull: allow pull to preserve merges when rebasing
---

6026f68652b6f220ce12c161fe8ac3e44a1b5b5a