From: Felipe Contreras <felipe.contreras@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, 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>,
"W. Trevor King" <wking@tremily.us>
Subject: Re: [PATCH v6 4/7] pull: add --merge option
Date: Fri, 02 May 2014 15:14:44 -0500 [thread overview]
Message-ID: <5363fcb47c77d_135215292ec3c@nysa.notmuch> (raw)
In-Reply-To: <20140502193250.GF75770@vauxhall.crustytoothpaste.net>
brian m. carlson wrote:
> My point is that it's unclear to me what options I need to use to
> retain the current behavior (fast-forward if possible, merge
> otherwise) without a warning.
The current behavior is to always merge (ff or otherwise), just what
`git merge` would do, so `git pull --merge`. I don't see what's
confusing about that.
--
Felipe Contreras
next prev parent reply other threads:[~2014-05-02 20:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-02 0:00 [PATCH v6 0/7] Reject non-ff pulls by default Felipe Contreras
2014-05-02 0:00 ` [PATCH v6 1/7] pull: rename pull.rebase to pull.mode Felipe Contreras
2014-05-02 14:13 ` W. Trevor King
2014-05-02 20:45 ` Richard Hansen
2014-05-02 21:12 ` Felipe Contreras
2014-05-02 23:51 ` Richard Hansen
2014-05-02 0:00 ` [PATCH v6 2/7] pull: migrate all the tests " Felipe Contreras
2014-05-02 0:00 ` [PATCH v6 3/7] pull: refactor $rebase variable into $mode Felipe Contreras
2014-05-02 0:00 ` [PATCH v6 4/7] pull: add --merge option Felipe Contreras
2014-05-02 1:37 ` brian m. carlson
2014-05-02 2:41 ` Felipe Contreras
2014-05-02 19:32 ` brian m. carlson
2014-05-02 20:14 ` Felipe Contreras [this message]
2014-05-02 20:44 ` brian m. carlson
2014-05-02 0:00 ` [PATCH v6 5/7] pull: add merge-ff-only option Felipe Contreras
2014-05-02 14:57 ` W. Trevor King
2014-05-02 0:00 ` [PATCH v6 6/7] pull: add warning on non-ff merges Felipe Contreras
2014-05-02 0:00 ` [PATCH v6 7/7] pull: only allow ff merges by default 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=5363fcb47c77d_135215292ec3c@nysa.notmuch \
--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 \
--cc=wking@tremily.us \
/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).