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>
Junio C Hamano committed
Feb 6, 2007 at 21:25 UTC
740afd961370ba3925ba3a1edf5b499bb068fd9a
2 files changed
+3
-1
Documentation/git-diff-stages.txt
+2
@@ -12,6 +12,8 @@ SYNOPSIS
12
13
DESCRIPTION
14
-----------
15
+DEPRECATED and will be removed in 1.5.1.
16
+
17
Compares the content and mode of the blobs in two stages in an
18
unmerged index file.
19
Documentation/git-resolve.txt
+1
-1
@@ -12,7 +12,7 @@ SYNOPSIS
12
13
DESCRIPTION
14
-----------
15
-DEPRECATED. Use `git-merge` instead.
15
+DEPRECATED and will be removed in 1.5.1. Use `git-merge` instead.
16
17
Given two commits and a merge message, merge the <merged> commit
18
into <current> commit, with the commit log message <message>.