From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: John Keeping <john@keeping.me.uk>
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, 08 Jul 2013 15:47:19 +0200 [thread overview]
Message-ID: <vpqd2qtkvtk.fsf@anie.imag.fr> (raw)
In-Reply-To: <2a6f4a3c31e667aa03b06ce63ae5319a25beaca0.1373223663.git.john@keeping.me.uk> (John Keeping's message of "Sun, 7 Jul 2013 20:02:14 +0100")
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.
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.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2013-07-08 13: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 [this message]
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=vpqd2qtkvtk.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.