From: Monsignor <3pzqma+9rz4ms8xqpvbw@sharklasers.com>
To: git@vger.kernel.org
Subject: Re: Use "git pull --ff-only" by default?
Date: Thu, 28 Apr 2016 23:38:50 -0700 (MST) [thread overview]
Message-ID: <1461911930694-7654696.post@n2.nabble.com> (raw)
In-Reply-To: <A612847CFE53224C91B23E3A5B48BAC74483234E90@xmail3.se.axis.com>
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.
prev parent reply other threads:[~2016-04-29 6:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-21 12:59 Use "git pull --ff-only" by default? Peter Kjellerstedt
2010-05-21 13:46 ` Ævar Arnfjörð Bjarmason
2010-05-21 13:49 ` Michael J Gruber
2010-05-21 14:47 ` Peter Kjellerstedt
2010-05-21 15:18 ` Michael J Gruber
2010-05-21 19:13 ` Jay Soffian
2010-05-22 11:37 ` Michael J Gruber
2010-05-24 8:22 ` Peter Kjellerstedt
2010-05-24 12:56 ` Dmitry Potapov
2010-05-25 8:43 ` Peter Kjellerstedt
2010-05-27 18:09 ` Dmitry Potapov
2010-05-21 17:49 ` Peter Krefting
2016-04-29 6:38 ` Monsignor [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461911930694-7654696.post@n2.nabble.com \
--to=3pzqma+9rz4ms8xqpvbw@sharklasers.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).