From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:00:23 +0000 (-0700)
Subject: Merge branch 'pt/pull-ff-vs-merge-ff' into maint
X-Git-Tag: v2.4.3~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7e46f27fa627c0f9f6f547bef53e5aa2de52dec5?ds=inline;hp=-c

Merge branch 'pt/pull-ff-vs-merge-ff' into maint

The pull.ff configuration was supposed to override the merge.ff
configuration, but it didn't.

* pt/pull-ff-vs-merge-ff:
pull: parse pull.ff as a bool or string
pull: make pull.ff=true override merge.ff
---

7e46f27fa627c0f9f6f547bef53e5aa2de52dec5
diff --combined Documentation/config.txt
index 9ccabb4a6e,f45bef13ae..f4fb31a08d
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -2033,7 -2033,7 +2033,7 @@@ pull.ff:
  	a case (equivalent to giving the `--no-ff` option from the command
  	line). When set to `only`, only such fast-forward merges are
  	allowed (equivalent to giving the `--ff-only` option from the
- 	command line).
+ 	command line). This setting overrides `merge.ff` when pulling.
  
  pull.rebase::
  	When true, rebase branches on top of the fetched branch, instead
@@@ -2270,18 -2270,18 +2270,18 @@@ remote.<name>.skipFetchAll:
  
  remote.<name>.receivepack::
  	The default program to execute on the remote side when pushing.  See
 -	option \--receive-pack of linkgit:git-push[1].
 +	option --receive-pack of linkgit:git-push[1].
  
  remote.<name>.uploadpack::
  	The default program to execute on the remote side when fetching.  See
 -	option \--upload-pack of linkgit:git-fetch-pack[1].
 +	option --upload-pack of linkgit:git-fetch-pack[1].
  
  remote.<name>.tagOpt::
 -	Setting this value to \--no-tags disables automatic tag following when
 -	fetching from remote <name>. Setting it to \--tags will fetch every
 +	Setting this value to --no-tags disables automatic tag following when
 +	fetching from remote <name>. Setting it to --tags will fetch every
  	tag from remote <name>, even if they are not reachable from remote
  	branch heads. Passing these flags directly to linkgit:git-fetch[1] can
 -	override this setting. See options \--tags and \--no-tags of
 +	override this setting. See options --tags and --no-tags of
  	linkgit:git-fetch[1].
  
  remote.<name>.vcs::