Re: [PATCH] push: mention "git pull" in error message for non-fast forwards

> The message remains fuzzy to include "git pull", "git pull --rebase" and
> others, but directs the user to the simplest solution in the vast
> majority of cases.
>
> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
> ---
> When the message was added, it was decided explicitely not to say
> explicitely "use git pull", first because there are other ways to
> merge, and then to encourage the users to read the docs.
>
> After a few months of teaching newbies/students to use Git, the
> question "it doesn't want to push, what shall I do" still comes in the
> top questions asked. Each time I've been asked, the newbie's face was
> enlightened by hearing just the word "pull".
>
> So I guess those few extra characters in the error message would save
> me a lot of time ;-).
>
>  builtin/push.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/push.c b/builtin/push.c
> index f4358b9..69bc2f2 100644
> --- a/builtin/push.c
> +++ b/builtin/push.c
> @@ -130,8 +130,8 @@ static int push_with_options(struct transport *transport, int flags)
>  
>  	if (nonfastforward && advice_push_nonfastforward) {
>  		fprintf(stderr, "To prevent you from losing history, non-fast-forward updates were rejected\n"
> -				"Merge the remote changes before pushing again.  See the 'Note about\n"
> -				"fast-forwards' section of 'git push --help' for details.\n");
> +				"Merge the remote changes (e.g. 'git pull') before pushing again.  See the\n"
> +				"'Note about fast-forwards' section of 'git push --help' for details.\n");
>  	}
>  
>  	return 1;