From 740afd961370ba3925ba3a1edf5b499bb068fd9a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 6 Feb 2007 21:25:33 -0800 Subject: [PATCH] Add deprecation notices. Schedule git-diff-stages and git-resolve to be removed by 1.5.1 Signed-off-by: Junio C Hamano --- Documentation/git-diff-stages.txt | 2 ++ Documentation/git-resolve.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt index 120d14e87e..b8f45b8cdc 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 0925973f12..7fde665fb5 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 commit into commit, with the commit log message . -- 2.11.4.GIT