From: John Keeping <john@keeping.me.uk>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Andreas Krey <a.krey@gmx.de>,
John Szakmeister <john@szakmeister.net>,
Philip Oakley <philipoakley@iee.org>,
John Keeping <john@keeping.me.uk>
Subject: [PATCH 0/2] Avoid suggestions to "merge" remote changes
Date: Sun, 7 Jul 2013 20:02:13 +0100 [thread overview]
Message-ID: <cover.1373223663.git.john@keeping.me.uk> (raw)
As another aspect of the change to make git-pull die when remote changes
do not fast-forward, this series changes the advice messages in git-push to
avoid implying that the user wants to merge remote changes.
I've chosen the word "integrate" because it does not carry any special
meaning in Git (in terms of being a command) and seems to cover the
merge and rebase cases nicely.
John Keeping (2):
push: avoid suggesting "merging" remote changes
pull: change the description to "integrate" changes
Documentation/git-pull.txt | 2 +-
builtin/push.c | 12 ++++++------
git-pull.sh | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
--
1.8.3.2.855.gbc9faed
next reply other threads:[~2013-07-07 19:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-07 19:02 John Keeping [this message]
2013-07-07 19:02 ` [PATCH 1/2] push: avoid suggesting "merging" remote changes John Keeping
2013-07-08 13:47 ` Matthieu Moy
2013-07-08 18:47 ` John Keeping
2013-07-07 19:02 ` [PATCH 2/2] pull: change the description to "integrate" changes John Keeping
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=cover.1373223663.git.john@keeping.me.uk \
--to=john@keeping.me.uk \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@szakmeister.net \
--cc=philipoakley@iee.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).