summaryrefslogtreecommitdiff
path: root/Documentation/git-push.txt
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2018-08-31 20:10:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-31 21:04:06 (GMT)
commitd931455acf1cf1a21a4f10fd99fc2bd9bbefa7a9 (patch)
tree2a32321bedf73d1f45555ab5279ba8a76433544c /Documentation/git-push.txt
parent6b0b0677f6d92932bacd73981a47724b543dfd90 (diff)
downloadgit-d931455acf1cf1a21a4f10fd99fc2bd9bbefa7a9.zip
git-d931455acf1cf1a21a4f10fd99fc2bd9bbefa7a9.tar.gz
git-d931455acf1cf1a21a4f10fd99fc2bd9bbefa7a9.tar.bz2
push doc: remove confusing mention of remote merger
Saying that "git push <remote> <src>:<dst>" won't push a merger of <src> and <dst> to <dst> is clear from the rest of the context here, so mentioning it is redundant, furthermore the mention of "EXAMPLES below" isn't specific or useful. This phrase was originally added in 149f6ddfb3 ("Docs: Expand explanation of the use of + in git push refspecs.", 2009-02-19), as can be seen in that change the point of the example being cited was to show that force pushing can leave unreferenced commits on the remote. It's enough that we explain that in its own section, it doesn't need to be mentioned here. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-push.txt')
-rw-r--r--Documentation/git-push.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 55277a9..83e499e 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -78,8 +78,7 @@ on the remote side. By default this is only allowed if <dst> is not
a tag (annotated or lightweight), and then only if it can fast-forward
<dst>. By having the optional leading `+`, you can tell Git to update
the <dst> ref even if it is not allowed by default (e.g., it is not a
-fast-forward.) This does *not* attempt to merge <src> into <dst>. See
-EXAMPLES below for details.
+fast-forward.).
+
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
+