From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v6 04/10] Documentation: replace: add --graft option Date: Mon, 07 Jul 2014 08:35:33 +0200 Message-ID: <20140707063540.3708.57293.chriscool@tuxfamily.org> References: <20140707063342.3708.83493.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Jeff King , Michael Haggerty , Jakub Narebski , Eric Sunshine To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Jul 07 08:37:08 2014 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 1X42Xo-0007iA-2T for gcvg-git-2@plane.gmane.org; Mon, 07 Jul 2014 08:36:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751942AbaGGGgr (ORCPT ); Mon, 7 Jul 2014 02:36:47 -0400 Received: from [194.158.98.14] ([194.158.98.14]:57005 "EHLO mail-1y.bbox.fr" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751401AbaGGGgg (ORCPT ); Mon, 7 Jul 2014 02:36:36 -0400 Received: from [127.0.1.1] (cha92-h01-128-78-31-246.dsl.sta.abo.bbox.fr [128.78.31.246]) by mail-1y.bbox.fr (Postfix) with ESMTP id F2A556E; Mon, 7 Jul 2014 08:36:14 +0200 (CEST) X-git-sha1: 07c07a7aa534b81ad8663917efb3eb0b8873ab74 X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20140707063342.3708.83493.chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- Documentation/git-replace.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 61461b9..491875e 100644 --- a/Documentation/git-replace.txt +++ b/Documentation/git-replace.txt @@ -10,6 +10,7 @@ SYNOPSIS [verse] 'git replace' [-f] 'git replace' [-f] --edit +'git replace' [-f] --graft [...] 'git replace' -d ... 'git replace' [--format=] [-l []] @@ -73,6 +74,13 @@ OPTIONS newly created object. See linkgit:git-var[1] for details about how the editor will be chosen. +--graft [...]:: + Create a graft commit. A new commit is created with the same + content as except that its parents will be + [...] instead of 's parents. A replacement ref + is then created to replace with the newly created + commit. + -l :: --list :: List replace refs for objects that match the given pattern (or -- 2.0.0.421.g786a89d.dirty