Commits

Junio C Hamano  committed 740afd9

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>

  • Participants
  • Parent commits 41dc7e0

Comments (0)

Files changed (2)

File Documentation/git-diff-stages.txt

 
 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.
 

File Documentation/git-resolve.txt

 
 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>.