From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: STEVEN WHITE <stevencharleswhitevoices@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 1/2] Documentation/user-manual: update outdated example output
Date: Wed, 23 Aug 2017 19:49:34 +0200 [thread overview]
Message-ID: <731cc618366d4835762d330e2398cf1a754ff11d.1503494617.git.martin.agren@gmail.com> (raw)
In-Reply-To: <CAJXxHvVSXkQ4SYA5=ZtnWZCBbVk51oWY1OqM_XbGNoruyAGBrA@mail.gmail.com>
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".
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
next prev parent reply other threads:[~2017-08-23 17:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-21 8:21 "Your branch is up-to-date ..." is incorrect English grammar STEVEN WHITE
2017-08-21 9:37 ` Martin Ågren
2017-08-21 22:37 ` Junio C Hamano
2017-08-23 3:55 ` STEVEN WHITE
2017-08-23 17:49 ` Martin Ågren [this message]
2017-08-23 19:02 ` [PATCH 1/2] Documentation/user-manual: update outdated example output Junio C Hamano
2017-08-23 17:49 ` [PATCH 2/2] treewide: correct several "up-to-date" to "up to date" Martin Ågren
2017-08-24 3:51 ` STEVEN WHITE
2017-08-24 9:48 ` Martin Ågren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=731cc618366d4835762d330e2398cf1a754ff11d.1503494617.git.martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stevencharleswhitevoices@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).