Merge branch 'maint'

diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt
index bd6cd4124546a867c029a0c14b16f1944f9eca88..aa40dfd36a6f210c5808791225014e023d18c0de 100644 (file)
--- a/Documentation/core-tutorial.txt
+++ b/Documentation/core-tutorial.txt
@@ -578,7 +578,7 @@ particular state. You can, for example, do
 $ git diff my-first-tag
 ----------------
 
-to diff your current state against that tag (which at this point will
+to diff your current state against that tag which at this point will
 obviously be an empty diff, but if you continue to develop and commit
 stuff, you can use your tag as an "anchor-point" to see what has changed
 since you tagged it.