Skip to content

Commit d931455

Browse files
avargitster
authored andcommitted
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 149f6dd ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6b0b067 commit d931455

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Documentation/git-push.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ on the remote side. By default this is only allowed if <dst> is not
7878
a tag (annotated or lightweight), and then only if it can fast-forward
7979
<dst>. By having the optional leading `+`, you can tell Git to update
8080
the <dst> ref even if it is not allowed by default (e.g., it is not a
81-
fast-forward.) This does *not* attempt to merge <src> into <dst>. See
82-
EXAMPLES below for details.
81+
fast-forward.).
8382
+
8483
`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
8584
+

0 commit comments

Comments
 (0)