From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jari Aalto Subject: [PATCH v3] git-rebase.sh: Update USAGE string Date: Mon, 04 Feb 2008 10:04:33 +0200 Organization: Private Message-ID: References: <7vodaxpo0i.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Feb 04 09:06:17 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 1JLwL2-0006rz-Nw for gcvg-git-2@gmane.org; Mon, 04 Feb 2008 09:06:01 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751861AbYBDIFW (ORCPT ); Mon, 4 Feb 2008 03:05:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752335AbYBDIFW (ORCPT ); Mon, 4 Feb 2008 03:05:22 -0500 Received: from main.gmane.org ([80.91.229.2]:57765 "EHLO ciao.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751697AbYBDIFV (ORCPT ); Mon, 4 Feb 2008 03:05:21 -0500 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1JLwKI-0003SG-OP for git@vger.kernel.org; Mon, 04 Feb 2008 08:05:14 +0000 Received: from a91-155-178-181.elisa-laajakaista.fi ([91.155.178.181]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 04 Feb 2008 08:05:14 +0000 Received: from jari.aalto by a91-155-178-181.elisa-laajakaista.fi with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 04 Feb 2008 08:05:14 +0000 X-Injected-Via-Gmane: http://gmane.org/ X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: a91-155-178-181.elisa-laajakaista.fi User-Agent: Gnus/5.110007 (No Gnus v0.7) Emacs/22.1 (windows-nt) Cancel-Lock: sha1:vmvJDNTs7HDN+Y7JxB7la7pvUlE= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Present the options in -s|--long (short, long) order. Mention merge and new whitespace option. Signed-off-by: Jari Aalto --- *********************************************************************** reworked patch (No. 3) *********************************************************************** [Junio C Hamano} >> [--whitespace=nowarn|warn|error|error-all|strip] > > I think that is probably the right thing to do in this case. It > is clear where the alternatives end, without adding extra > grouping, so it keeps the description easy to read. git-rebase.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index bdcea0e..6128455 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,7 +3,10 @@ # Copyright (c) 2005 Junio C Hamano. # -USAGE='[--interactive | -i] [-v] [--onto ] []' +USAGE='[-i|--interactive] [-v|--verbose] +[--whitespace=nowarn|warn|error|error-all|strip] +[-m|--merge] [--onto ] []' + LONG_USAGE='git-rebase replaces with a new branch of the same name. When the --onto option is provided the new branch starts out with a HEAD equal to , otherwise it is equal to -- 1.5.4-rc5.GIT-dirty