rev-list --max-age, --max-count: support --boundary

[git.git] / Documentation / git-diff-stages.txt

diff --git a/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt
index 28c60fc7e40a042c5cdbad22b103a9d93faeaae6..b8f45b8cdc2d4d2598e392efbbbed9d867080f62 100644 (file)
--- a/Documentation/git-diff-stages.txt
+++ b/Documentation/git-diff-stages.txt
@@ -3,7 +3,7 @@ git-diff-stages(1)
 
 NAME
 ----
 
 NAME
 ----

-git-diff-stages - Compares content and mode of blobs between stages in an unmerged index file.
+git-diff-stages - Compares two merge stages in the index

 
 
 SYNOPSIS
 
 
 SYNOPSIS


@@ -12,6 +12,8 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

+DEPRECATED and will be removed in 1.5.1.
+

 Compares the content and mode of the blobs in two stages in an
 unmerged index file.
 
 Compares the content and mode of the blobs in two stages in an
 unmerged index file.