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

From

MÅMartin Ågren <martin.agren@gmail.com>

Date

Aug 23, 2017, 17:49 UTC

Message-ID

<731cc618366d4835762d330e2398cf1a754ff11d.1503494617.git.martin.agren@gmail.com>

In-Reply-To

<CAJXxHvVSXkQ4SYA5=ZtnWZCBbVk51oWY1OqM_XbGNoruyAGBrA@mail.gmail.com>

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".

 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:

-- 
2.14.1.151.g45c1275a3.dirty