git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Use "git pull --ff-only" by default?
Date: Fri, 21 May 2010 14:59:07 +0200	[thread overview]
Message-ID: <A612847CFE53224C91B23E3A5B48BAC74483234E90@xmail3.se.axis.com> (raw)

Is there some way to make "git pull --ff-only" be the default?
I could not find anything about this in "git config --help" and
also the lack of a --no-ff-only option for git pull (it exists 
for git merge) indicates that there is no such support.

I did considered the branch.<name>.mergeoptions configuration
option, but it does not seem appropriate as it only applies to
a specific branch, whereas I want it to apply to all branches
by default.

Yes, I know I could do "git config alias.pl 'pull --ff-only'",
but since my intensions are for this to be the default for all
developers in our organization (most of whom have no git knowledge
at all yet) to avoid unnecessary branches caused by the developers 
hacking directly on master rather than a topic branch, I would 
very much prefer a configuration option rather than an alias (as 
I am unlikely to get the developers to remember to do "git pl" 
instead of "git pull").

My idea was to add something like merge.options and pull.options
as configuration options (I want to be able to specify the options
separately for pull and merge). However, I wanted throw this out
here first before starting to hack away at the code, in case I
missed something obvious, or if others find this to be an
incredibly stupid idea...

//Peter

             reply	other threads:[~2010-05-21 12:59 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-21 12:59 Peter Kjellerstedt [this message]
2010-05-21 13:46 ` Use "git pull --ff-only" by default? Æ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

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=A612847CFE53224C91B23E3A5B48BAC74483234E90@xmail3.se.axis.com \
    --to=peter.kjellerstedt@axis.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.
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 NNTP newsgroup(s).