undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation/user-manual: update outdated example output

Browse Source 
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>
This commit is contained in:
Martin Ågren 2017-08-23 19:49:34 +02:00 committed by Junio C Hamano
parent 4d7268b888
commit 3c82eec8fb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/user-manual.txt
View File

@ -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: remote branch, then it will fail with an error like:
------------------------------------------------- -------------------------------------------------
error: remote 'refs/heads/master' is not an ancestor of ! [rejected] master -> master (non-fast-forward)
local 'refs/heads/master'. error: failed to push some refs to '...'
Maybe you are not up-to-date and need to pull first? hint: Updates were rejected because the tip of your current branch is behind
error: failed to push to 'ssh://yourserver.com/~you/proj.git' 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: This can happen, for example, if you: