git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Andreas Krey <a.krey@gmx.de>, John Keeping <john@keeping.me.uk>,
	Jeff King <peff@peff.net>, Richard Hansen <rhansen@bbn.com>,
	Philip Oakley <philipoakley@iee.org>,
	sandals@crustytoothpaste.net,
	Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v3 0/5] Preparation for non-ff pulls by default
Date: Sun,  8 Sep 2013 20:23:11 -0500	[thread overview]
Message-ID: <1378689796-19305-1-git-send-email-felipe.contreras@gmail.com> (raw)

It is very typical for Git newcomers to inadvertently create merges and worst:
inadvertently pushing them. This is one of the reasons many experienced users
prefer to avoid 'git pull', and recommend newcomers to avoid it as well.

To avoid these problems and keep 'git pull' useful, it has been suggested
that 'git pull' barfs by default if the merge is non-fast-forward, which
unfortunately would break backwards compatibility.

This patch series leaves everything in place to enable this new mode, but it
only gets enabled if the user specifically configures it; pull.mode =
merge-ff-only.

Later on this mode can be enabled by default (e.g. in v2.0).

To achieve that first some configurations are renamed: for example: pull.rebase
=> pull.mode = rebase, but the old ones remain functional, thus there are no
functional changes.

Then the new mode 'merge-ff-only' is added, but not enabled by default, and
finally, a warning is added so the users will know what to do when the new
mode is indeed enabled by default.

Felipe Contreras (5):
  pull: rename pull.rename to pull.mode
  pull: refactor $rebase variable into $mode
  pull: add --merge option
  pull: add merge-ff-only option
  pull: add warning on non-ff merges

 Documentation/config.txt   | 24 ++++++++++--------
 Documentation/git-pull.txt | 10 +++++---
 branch.c                   |  4 +--
 git-pull.sh                | 63 +++++++++++++++++++++++++++++++++++++---------
 t/t3200-branch.sh          | 40 ++++++++++++++---------------
 t/t5520-pull.sh            | 62 +++++++++++++++++++++++++++++++++++++++++++++
 t/t5601-clone.sh           |  4 +--
 7 files changed, 157 insertions(+), 50 deletions(-)

-- 
1.8.4-338-gefd7fa6

             reply	other threads:[~2013-09-09  1:28 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-09  1:23 Felipe Contreras [this message]
2013-09-09  1:23 ` [PATCH v3 1/5] pull: rename pull.rename to pull.mode Felipe Contreras
2013-09-09 21:23   ` Richard Hansen
2013-09-09 22:49     ` Felipe Contreras
2013-09-10  2:21       ` Jeff King
2013-09-10  6:46         ` Felipe Contreras
2013-09-10  6:52           ` Jeff King
2013-09-10  8:16           ` Matthieu Moy
2013-10-11 23:56             ` Felipe Contreras
2013-10-12  0:32               ` Richard Hansen
2013-10-12  0:50               ` Jeff King
2013-10-12  1:15                 ` Felipe Contreras
2013-10-12  1:25                   ` Jeff King
2013-10-12  2:08                     ` Felipe Contreras
2013-10-12  4:40                       ` Richard Hansen
2013-10-12  6:21                         ` Felipe Contreras
2013-09-19 19:33       ` Richard Hansen
2013-10-11 23:54         ` Felipe Contreras
2013-09-10 21:34   ` Junio C Hamano
2013-09-09  1:23 ` [PATCH v3 2/5] pull: refactor $rebase variable into $mode Felipe Contreras
2013-09-09  1:23 ` [PATCH v3 3/5] pull: add --merge option Felipe Contreras
2013-09-09  1:23 ` [PATCH v3 4/5] pull: add merge-ff-only option Felipe Contreras
2013-09-09  1:23 ` [PATCH v3 5/5] pull: add warning on non-ff merges Felipe Contreras
2013-09-09  1:49   ` Felipe Contreras

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=1378689796-19305-1-git-send-email-felipe.contreras@gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=a.krey@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=john@keeping.me.uk \
    --cc=peff@peff.net \
    --cc=philipoakley@iee.org \
    --cc=rhansen@bbn.com \
    --cc=sandals@crustytoothpaste.net \
    /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).