From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v3 3/4] Documentation: replace: add --graft option Date: Wed, 04 Jun 2014 21:43:51 +0200 Message-ID: <20140604194353.23903.41340.chriscool@tuxfamily.org> References: <20140604194118.23903.3019.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Jeff King , Jakub Narebski , Eric Sunshine To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Jun 05 07:29:20 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 1WsQEo-0007F7-EL for gcvg-git-2@plane.gmane.org; Thu, 05 Jun 2014 07:29:18 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751588AbaFEF3H (ORCPT ); Thu, 5 Jun 2014 01:29:07 -0400 Received: from mail-1y.bbox.fr ([194.158.98.14]:32866 "EHLO mail-1y.bbox.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751140AbaFEF3E (ORCPT ); Thu, 5 Jun 2014 01:29:04 -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 75D4B38; Thu, 5 Jun 2014 07:29:00 +0200 (CEST) X-git-sha1: 9349e6f8264f331b73ef11eda2b47f3e26347202 X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20140604194118.23903.3019.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 --- 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.rc0.40.gd30ccc4