git-send-email: Document configuration options

[git.git] / Documentation / git-resolve.txt

diff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt
index db38e2407ab3e8344db05c3048db9e46db023376..7fde665fb5a0fe477c4ac534668419fef1ffe719 100644 (file)
--- a/Documentation/git-resolve.txt
+++ b/Documentation/git-resolve.txt
@@ -8,10 +8,12 @@ git-resolve - Merge two commits
 
 SYNOPSIS
 --------
-'git resolve' <current> <merged> <message>
+'git-resolve' <current> <merged> <message>
 
 DESCRIPTION
 -----------
+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>.