path: root/Documentation/gitcore-tutorial.txt
diff options
authorFelipe Contreras <>2009-10-24 08:31:32 (GMT)
committerJunio C Hamano <>2009-10-25 06:50:28 (GMT)
commita75d7b54097ef0d0945cbe673a9940d6c561f95c (patch)
tree40d03cbf093fd503448d31d3a71319be3f1d4fac /Documentation/gitcore-tutorial.txt
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff)
Use 'fast-forward' all over the place
It's a compound word. Signed-off-by: Felipe Contreras <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/gitcore-tutorial.txt')
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index b3640c4..253ef62 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -993,7 +993,7 @@ would be different)
Updating from ae3a2da... to a80b4aa....
-Fast forward (no commit created; -m option ignored)
+Fast-forward (no commit created; -m option ignored)
example | 1 +
hello | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
@@ -1003,7 +1003,7 @@ Because your branch did not contain anything more than what had
already been merged into the `master` branch, the merge operation did
not actually do a merge. Instead, it just updated the top of
the tree of your branch to that of the `master` branch. This is
-often called 'fast forward' merge.
+often called 'fast-forward' merge.
You can run `gitk \--all` again to see how the commit ancestry
looks like, or run 'show-branch', which tells you this.