From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre Habouzit Subject: [PATCH] git-rebase -i: improve help readability Date: Wed, 11 Jun 2008 17:01:30 +0200 Message-ID: <1213196490-7762-2-git-send-email-madcoder@debian.org> References: <1213196490-7762-1-git-send-email-madcoder@debian.org> Cc: gitster@pobox.com, Pierre Habouzit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Jun 11 17:03:40 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1K6RrL-0000XR-1p for gcvg-git-2@gmane.org; Wed, 11 Jun 2008 17:03:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754478AbYFKPBf (ORCPT ); Wed, 11 Jun 2008 11:01:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754242AbYFKPBf (ORCPT ); Wed, 11 Jun 2008 11:01:35 -0400 Received: from pan.madism.org ([88.191.52.104]:42766 "EHLO hermes.madism.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753284AbYFKPBe (ORCPT ); Wed, 11 Jun 2008 11:01:34 -0400 Received: from madism.org (APuteaux-103-1-3-109.w217-128.abo.wanadoo.fr [217.128.49.109]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "artemis.madism.org", Issuer "madism.org" (verified OK)) by hermes.madism.org (Postfix) with ESMTPS id 7E3AD3535A; Wed, 11 Jun 2008 17:01:33 +0200 (CEST) Received: by madism.org (Postfix, from userid 1000) id 04BD016240; Wed, 11 Jun 2008 17:01:30 +0200 (CEST) X-Mailer: git-send-email 1.5.6.rc2.128.g6656e In-Reply-To: <1213196490-7762-1-git-send-email-madcoder@debian.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Pierre Habouzit --- git-rebase--interactive.sh | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c1b4260..a3c5488 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -695,15 +695,16 @@ do # to a commit previously marked with the 'mark' insn. # # Commands: -# p, pick = use commit -# e, edit = use commit, but stop for amending -# c, comment = use commit, but stop for changing the commit message -# s, squash = use commit, but meld into previous commit -# mark :mark = mark the current HEAD for later reference -# reset commit = reset HEAD to the commit -# merge commit-M commit-P ... = redo merge commit-M with the -# current HEAD and the parents commit-P -# tag = reset tag to the current HEAD +# p, pick use commit +# e, edit use commit, but stop for amending +# c, comment use commit, but update the commit message on the way +# s, squash use commit, but meld into previous commit +# mark :mark mark the current HEAD for later reference +# reset commit reset HEAD to the commit +# merge commit-M commit-P +# redo merge commit-M with the current HEAD +# and the parents commit-P +# tag reset tag to the current HEAD # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. -- 1.5.6.rc2.128.g6656e