From: Junio C Hamano <junkio@cox.net>
Date: Wed, 7 Feb 2007 05:25:33 +0000 (-0800)
Subject: Add deprecation notices.
X-Git-Tag: v1.5.0-rc4~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=740afd961370ba3925ba3a1edf5b499bb068fd9a;p=git.git

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 120d14e87..b8f45b8cd 100644
--- 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 0925973f1..7fde665fb 100644
--- 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>.