diff options
author | Felipe Contreras <felipe.contreras@gmail.com> | 2009-10-24 11:31:32 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-10-24 23:50:28 -0700 |
commit | a75d7b54097ef0d0945cbe673a9940d6c561f95c (patch) | |
tree | 40d03cbf093fd503448d31d3a71319be3f1d4fac /Documentation/pull-fetch-param.txt | |
parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) | |
download | git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.gz git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.xz |
Use 'fast-forward' all over the place
It's a compound word.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/pull-fetch-param.txt')
-rw-r--r-- | Documentation/pull-fetch-param.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index f9811f247..44d936341 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -11,9 +11,9 @@ + The remote ref that matches <src> is fetched, and if <dst> is not empty string, the local -ref that matches it is fast forwarded using <src>. +ref that matches it is fast-forwarded using <src>. If the optional plus `+` is used, the local ref -is updated even if it does not result in a fast forward +is updated even if it does not result in a fast-forward update. + [NOTE] |