diff options
| -rw-r--r-- | Documentation/git-diff-stages.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-resolve.txt | 2 |
2 files changed, 3 insertions, 1 deletions
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 <merged> commit into <current> commit, with the commit log message <message>. |