John Keeping <> 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
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to