mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
41dc7e0044
commit
740afd9613
|
@ -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.
|
||||
|
||||
|
|
|
@ -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>.
|
||||
|
|
Loading…
Reference in a new issue