summaryrefslogtreecommitdiffstats
path: root/git-send-pack.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-11-16 02:10:54 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-11-16 02:10:54 +0000
commit3f680f3f3b57189c755ddb5f3c7f099ddab1b221 (patch)
tree2a5e1f1d44ea53e5d9fa7ebcf56d558feac065c7 /git-send-pack.txt
parente1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (diff)
downloadgit-htmldocs-3f680f3f3b57189c755ddb5f3c7f099ddab1b221.tar.gz
Autogenerated HTML docs for v1.6.5.2-215-g77097f
Diffstat (limited to 'git-send-pack.txt')
-rw-r--r--git-send-pack.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-send-pack.txt b/git-send-pack.txt
index 399821832..5a04c6eaf 100644
--- a/git-send-pack.txt
+++ b/git-send-pack.txt
@@ -105,11 +105,11 @@ name. See linkgit:git-rev-parse[1].
Without '--force', the <src> ref is stored at the remote only if
<dst> does not exist, or <dst> is a proper subset (i.e. an
-ancestor) of <src>. This check, known as "fast forward check",
+ancestor) of <src>. 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 <ref> parameter can be prefixed with a plus '+' sign
to disable the fast-forward check only on that ref.