From: John Keeping <john@keeping.me.uk>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Andreas Krey <a.krey@gmx.de>,
John Szakmeister <john@szakmeister.net>,
Philip Oakley <philipoakley@iee.org>
Subject: Re: [PATCH 1/2] push: avoid suggesting "merging" remote changes
Date: Mon, 8 Jul 2013 19:47:16 +0100 [thread overview]
Message-ID: <20130708184715.GW9161@serenity.lan> (raw)
In-Reply-To: <vpqd2qtkvtk.fsf@anie.imag.fr>
On Mon, Jul 08, 2013 at 03:47:19PM +0200, Matthieu Moy wrote:
> John Keeping <john@keeping.me.uk> writes:
>
> > static const char message_advice_pull_before_push[] =
> > N_("Updates were rejected because the tip of your current branch is behind\n"
> > - "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
> > - "before pushing again.\n"
> > + "its remote counterpart. Integrate the remote changes (e.g.\n"
> > + "'git pull ...') before pushing again.\n"
>
> To me, "merge" includes "rebase", so I'd say the merge -> integrate
> change is not needed, but I have nothing against it either.
Yes, I agree that in some sense "merge" does include "rebase" but I
suspect some people read it to mean "git merge" and saying "integrate"
removes that potential source of confusion.
> The "..." added are a bit weird with the quotes around. Quotes may
> suggest that the content is to be taken literally, which is not the case
> anymore. Not a real objection anyway, just thinking aloud.
I hadn't thought of it that way, but I wonder how else we can delimit
the command.
next prev parent reply other threads:[~2013-07-08 18:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-07 19:02 [PATCH 0/2] Avoid suggestions to "merge" remote changes John Keeping
2013-07-07 19:02 ` [PATCH 1/2] push: avoid suggesting "merging" " John Keeping
2013-07-08 13:47 ` Matthieu Moy
2013-07-08 18:47 ` John Keeping [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130708184715.GW9161@serenity.lan \
--to=john@keeping.me.uk \
--cc=Matthieu.Moy@grenoble-inp.fr \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).