Merge branch 'jc/diff' into next

diff --git a/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt
index 276d7bdc43c3e95e2192e38b6d30e730ab2c3a68..32739186276da09935c4905eb01d351cd5faa587 100644 (file)
--- a/Documentation/git-diff-stages.txt
+++ b/Documentation/git-diff-stages.txt
@@ -1,10 +1,9 @@
 git-diff-stages(1)
 ==================
-v0.1, June 2005
 
 NAME
 ----
-git-diff-stages - Compares content and mode of blobs between stages in an unmerged index file.
+git-diff-stages - Compares content and mode of blobs between stages in an unmerged index file
 
 
 SYNOPSIS