From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Feb 2014 22:01:11 +0000 (-0800)
Subject: Merge branch 'da/pull-ff-configuration'
X-Git-Tag: v2.0.0-rc0~165
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7da5fd6895af9066ad4684e333c57f4086589c2f;p=thirdparty%2Fgit.git

Merge branch 'da/pull-ff-configuration'

"git pull" learned to pay attention to pull.ff configuration
variable.

* da/pull-ff-configuration:
  pull: add --ff-only to the help text
  pull: add pull.ff configuration
---

7da5fd6895af9066ad4684e333c57f4086589c2f