summaryrefslogtreecommitdiff
path: root/Documentation/githooks.txt
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2009-10-24 11:31:32 +0300
committerJunio C Hamano <gitster@pobox.com>2009-10-24 23:50:28 -0700
commita75d7b54097ef0d0945cbe673a9940d6c561f95c (patch)
tree40d03cbf093fd503448d31d3a71319be3f1d4fac /Documentation/githooks.txt
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff)
downloadgit-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.gz
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/githooks.txt')
-rw-r--r--Documentation/githooks.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 06e0f315c3..4cc3d1387f 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -229,7 +229,7 @@ from updating that ref.
This hook can be used to prevent 'forced' update on certain refs by
making sure that the object name is a commit object that is a
descendant of the commit object named by the old object name.
-That is, to enforce a "fast forward only" policy.
+That is, to enforce a "fast-forward only" policy.
It could also be used to log the old..new status. However, it
does not know the entire set of branches, so it would end up