[PATCH] git-cherry-pick -x works with conflicting commits

From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Mar 24, 2008, 10:41 UTC
Message-ID: <1206355274-6052-1-git-send-email-rgarciasuarez@gmail.com>

So this patch fixes the docs to reflect that.

Signed-off-by: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
---
 Documentation/git-cherry-pick.txt |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index f0beb41..475e168 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -29,8 +29,7 @@ OPTIONS
 -x::
 	When recording the commit, append to the original commit
 	message a note that indicates which commit this change
-	was cherry-picked from.  Append the note only for cherry
-	picks without conflicts.  Do not use this option if
+	was cherry-picked from.  Do not use this option if
 	you are cherry-picking from your private branch because
 	the information is useless to the recipient.  If on the
 	other hand you are cherry-picking between two publicly

-- 
1.5.5.rc1