Documentation/user-manual: update outdated example output
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin Ågren committed
Aug 23, 2017 at 19:49 UTC
3c82eec8fbae30860c58afba11e8b48186a06c35
1 file changed
+6
-4
Documentation/user-manual.txt
+6
-4
@@ -2044,10 +2044,12 @@ If a push would not result in a <<fast-forwards,fast-forward>> of the
2044
remote branch, then it will fail with an error like:
2045
2046
-------------------------------------------------
2047
-error: remote 'refs/heads/master' is not an ancestor of
2048
- local 'refs/heads/master'.
2049
- Maybe you are not up-to-date and need to pull first?
2050
-error: failed to push to 'ssh://yourserver.com/~you/proj.git'
2047
+ ! [rejected] master -> master (non-fast-forward)
2048
+error: failed to push some refs to '...'
2049
+hint: Updates were rejected because the tip of your current branch is behind
2050
+hint: its remote counterpart. Integrate the remote changes (e.g.
2051
+hint: 'git pull ...') before pushing again.
2052
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
2053
-------------------------------------------------
2054
2055
This can happen, for example, if you: