On Mon, Jul 08, 2013 at 03:47:19PM +0200, Matthieu Moy wrote:
> John Keeping <john@xxxxxxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html