summaryrefslogtreecommitdiffstats
path: root/Documentation/howto/maintain-git.txt
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2009-10-24 10:31:32 +0200
committerJunio C Hamano <gitster@pobox.com>2009-10-25 07:50:28 +0100
commita75d7b54097ef0d0945cbe673a9940d6c561f95c (patch)
tree40d03cbf093fd503448d31d3a71319be3f1d4fac /Documentation/howto/maintain-git.txt
parentGIT 1.6.5 (diff)
downloadgit-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.xz
git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.zip
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/howto/maintain-git.txt')
-rw-r--r--Documentation/howto/maintain-git.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt
index 4357e26913..d527b30770 100644
--- a/Documentation/howto/maintain-git.txt
+++ b/Documentation/howto/maintain-git.txt
@@ -59,7 +59,7 @@ The policy.
not yet pass the criteria set for 'next'.
- The tips of 'master', 'maint' and 'next' branches will always
- fast forward, to allow people to build their own
+ fast-forward, to allow people to build their own
customization on top of them.
- Usually 'master' contains all of 'maint', 'next' contains all