Add deprecation notices.

Schedule git-diff-stages and git-resolve to be removed by 1.5.1

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt
index 120d14e87e4641e6b5d84cb5127074860623c6ed..b8f45b8cdc2d4d2598e392efbbbed9d867080f62 100644 (file)
--- a/Documentation/git-diff-stages.txt
+++ b/Documentation/git-diff-stages.txt
@@ -12,6 +12,8 @@ SYNOPSIS
 
 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.
 

diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt
index 0925973f12edcb863ede32cf1e95d9e9ebac1cf5..7fde665fb5a0fe477c4ac534668419fef1ffe719 100644 (file)
--- a/Documentation/git-resolve.txt
+++ b/Documentation/git-resolve.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-DEPRECATED.  Use `git-merge` instead.
+DEPRECATED and will be removed in 1.5.1.  Use `git-merge` instead.
 
 Given two commits and a merge message, merge the <merged> commit
 into <current> commit, with the commit log message <message>.