Merge branch 'master' into next

diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index a3d45ee569ef19a131bf8c8ca351b5b5203390c4..7de91aa73532ce91c88cf7b2865dd4d16cdf1782 100644 (file)
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -214,7 +214,7 @@ $ git diff
 +++ b/file.txt
 @@ -1 +1,2 @@
  hello world!
- +hello world, again
++hello world, again
 $ git update-index file.txt
 $ git diff
 ------------------------------------------------
@@ -230,7 +230,7 @@ index a042389..513feba 100644
 +++ b/file.txt
 @@ -1 +1,2 @@
  hello world!
- +hello world, again
++hello world, again
 ------------------------------------------------
 
 So "git diff" is comparing against something other than the head.