From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: [PATCH] cherry-pick: fix docs describing handling of empty commits Date: Mon, 30 Mar 2015 21:08:54 -0400 Message-ID: <20150331010854.GA17811@peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Mar 31 03:09:04 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yckft-0005BO-LF for gcvg-git-2@plane.gmane.org; Tue, 31 Mar 2015 03:09:02 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754015AbbCaBI5 (ORCPT ); Mon, 30 Mar 2015 21:08:57 -0400 Received: from cloud.peff.net ([50.56.180.127]:40093 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752066AbbCaBI5 (ORCPT ); Mon, 30 Mar 2015 21:08:57 -0400 Received: (qmail 27725 invoked by uid 102); 31 Mar 2015 01:08:56 -0000 Received: from Unknown (HELO peff.net) (10.0.1.1) by cloud.peff.net (qpsmtpd/0.84) with SMTP; Mon, 30 Mar 2015 20:08:56 -0500 Received: (qmail 18839 invoked by uid 107); 31 Mar 2015 01:09:13 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.84) with SMTP; Mon, 30 Mar 2015 21:09:13 -0400 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Mon, 30 Mar 2015 21:08:54 -0400 Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Commit b27cfb0 (git-cherry-pick: Add keep-redundant-commits option, 2012-04-20), added the --keep-redundant-commits option, and switched the default behavior (without that option) to silently ignore empty commits. Later, the second half of that commit was reverted in ac2b0e8 (cherry-pick: regression fix for empty commits, 2012-05-29), but the documentation added for --keep-redundant-commits was never updated to match. Let's do so now. Signed-off-by: Jeff King --- Documentation/git-cherry-pick.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 1c03c79..1147c71 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -131,7 +131,8 @@ effect to your index in a row. --keep-redundant-commits:: If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these - redundant commits are ignored. This option overrides that behavior and + redundant commits cause `cherry-pick` to stop so the user can + examine the commit. This option overrides that behavior and creates an empty commit object. Implies `--allow-empty`. --strategy=:: -- 2.4.0.rc0.363.gf9f328b