X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-http-push.txt;h=ddf7a18dc42ef4d5f8ad44aed89ee5b17bb0e9a6;hb=3cc3fb7df67dc9c83b71fec82e5bfb1df3724089;hp=aef383e0b142bd603b77620cad720c102d70c4b7;hpb=a1eb73d917e15cd97314e0a39cbe857329339a96;p=git.git diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt index aef383e0b..ddf7a18dc 100644 --- a/Documentation/git-http-push.txt +++ b/Documentation/git-http-push.txt @@ -82,11 +82,11 @@ destination side. Without '--force', the ref is stored at the remote only if does not exist, or is a proper subset (i.e. an -ancestor) of . This check, known as "fast forward check", +ancestor) of . This check, known as "fast-forward check", is performed in order to avoid accidentally overwriting the remote ref and lose other peoples' commits from there. -With '--force', the fast forward check is disabled for all refs. +With '--force', the fast-forward check is disabled for all refs. Optionally, a parameter can be prefixed with a plus '+' sign to disable the fast-forward check only on that ref.