From: Monsignor <3pzqma+9rz4ms8xqpvbw@sharklasers.com> Date: Fri, 29 Apr 2016 06:38:50 GMT Subject: Re: Use "git pull --ff-only" by default? Message-ID: <1461911930694-7654696.post@n2.nabble.com> In-Reply-To: For people who still find this thread in Google, there is a way to do that now: *git config --add pull.ff only* >From the documentation: pull.ff By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to false, this variable tells Git to create an extra merge commit in such 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). This setting overrides merge.ff when pulling. -- View this message in context: http://git.661346.n2.nabble.com/Use-git-pull-ff-only-by-default-tp5084103p7654696.html Sent from the git mailing list archive at Nabble.com.