Home » Mailing list archives » git » 2008 » March » 24

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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Rafael Garcia-Suarez
Subject: [PATCH] git-cherry-pick -x works with conflicting commits
Date: Monday, March 24, 2008 - 3:41 am

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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] git-cherry-pick -x works with conflicting commits, Rafael Garcia-Suarez, (Mon Mar 24, 3:41 am)
Re: [PATCH] git-cherry-pick -x works with conflicting commits, Jean-Baptiste Quenot, (Mon Mar 24, 6:55 am)
Re: [PATCH] git-cherry-pick -x works with conflicting commits, Rafael Garcia-Suarez, (Mon Mar 24, 7:52 am)
Re: [PATCH] git-cherry-pick -x works with conflicting commits, Jean-Baptiste Quenot, (Mon Mar 24, 11:32 am)