summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2017-08-23 17:49:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-23 19:02:47 (GMT)
commit3c82eec8fbae30860c58afba11e8b48186a06c35 (patch)
tree83369af2c09f7e7d933cc12e074f964dffbd218c /Documentation
parent4d7268b888d7bb6d675340ec676e4239739d0f6d (diff)
downloadgit-3c82eec8fbae30860c58afba11e8b48186a06c35.zip
git-3c82eec8fbae30860c58afba11e8b48186a06c35.tar.gz
git-3c82eec8fbae30860c58afba11e8b48186a06c35.tar.bz2
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/user-manual.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index bc29298..d3c53b5 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: