Re: [PATCH 1/2] Documentation/user-manual: update outdated example output

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 23, 2017, 19:02 UTC
Message-ID: <xmqqfuciyuog.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <731cc618366d4835762d330e2398cf1a754ff11d.1503494617.git.martin.agren@gmail.com>

Martin Ågren <martin.agren@gmail.com> writes:

Show 8 quoted lines

> Since commit f7673490 ("more terse push output", 2007-11-05), git push
> has a completely different output format than the one shown in the user
> manual for a non-fast-forward push.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>
> ---
> I'd say it's "not very many read this and immediately tried it out" and
> not "nobody read this for the last ten years".

Thanks for spotting, and I tend to agree that the above is very close to a fair assessment.

When the software was young, those who adopted early were much more highly motivated to not just follow documentation and examples but also to improve them, compared to the more recent crop of new users who can take it granted that "other people" work on supplying tools and learning material for free. And that is not a bad thing---it is progress.

So it may even be "many may have read, tried and found it different from reality, but did not bother trying to fix or even report".

Show 24 quoted lines

>  Documentation/user-manual.txt | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
> index bc2929867..d3c53b513 100644
> --- a/Documentation/user-manual.txt
> +++ b/Documentation/user-manual.txt
> @@ -2044,10 +2044,12 @@ If a push would not result in a <<fast-forwards,fast-forward>> of the
>  remote branch, then it will fail with an error like:
>  
>  -------------------------------------------------
> -error: remote 'refs/heads/master' is not an ancestor of
> - local  'refs/heads/master'.
> - Maybe you are not up-to-date and need to pull first?
> -error: failed to push to 'ssh://yourserver.com/~you/proj.git'
> + ! [rejected]        master -> master (non-fast-forward)
> +error: failed to push some refs to '...'
> +hint: Updates were rejected because the tip of your current branch is behind
> +hint: its remote counterpart. Integrate the remote changes (e.g.
> +hint: 'git pull ...') before pushing again.
> +hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>  -------------------------------------------------
>  
>  This can happen, for example, if you: