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>,
"Brian M. Carlson" <sandals@crustytoothpaste.net>,
"W. Trevor King" <wking@tremily.us>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v6 4/7] pull: add --merge option
Date: Thu, 1 May 2014 19:00:05 -0500 [thread overview]
Message-ID: <1398988808-29678-5-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1398988808-29678-1-git-send-email-felipe.contreras@gmail.com>
Also, deprecate --no-rebase since there's no need for it any more.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
Documentation/git-pull.txt | 8 ++++++--
git-pull.sh | 10 +++++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 9a91b9f..767bca3 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -127,8 +127,12 @@ It rewrites history, which does not bode well when you
published that history already. Do *not* use this option
unless you have read linkgit:git-rebase[1] carefully.
---no-rebase::
- Override earlier --rebase.
+-m::
+--merge::
+ Force a merge.
++
+See `pull.mode`, `branch.<name>.pullmode` in linkgit:git-config[1] if you want
+to make `git pull` always use `--merge`.
Options related to fetching
~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/git-pull.sh b/git-pull.sh
index 50c612f..e7e52ec 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -15,6 +15,10 @@ require_work_tree_exists
cd_to_toplevel
+warn () {
+ printf >&2 'warning: %s\n' "$*"
+}
+
die_conflict () {
git diff-index --cached --name-status -r --ignore-submodules HEAD --
if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
@@ -142,8 +146,12 @@ do
-r|--r|--re|--reb|--reba|--rebas|--rebase)
mode=rebase
;;
+ -m|--m|--me|--mer|--merg|--merge)
+ mode=merge
+ ;;
--no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
- mode=
+ mode=merge
+ warn "$(gettext "--no-rebase is deprecated, please use --merge instead")"
;;
--recurse-submodules)
recurse_submodules=--recurse-submodules
--
1.9.2+fc1.19.g85b6256
next prev parent reply other threads:[~2014-05-02 0:11 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 ` Felipe Contreras [this message]
2014-05-02 1:37 ` [PATCH v6 4/7] pull: add --merge option 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
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=1398988808-29678-5-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 \
--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).