From: Jari Aalto <jari.aalto@cante•net>
To: git@vger•kernel.org
Subject: [PATCH] git-rebase.sh: Update USAGE string (No. 1)
Date: Mon, 04 Feb 2008 01:33:38 +0200 [thread overview]
Message-ID: <ir15399p.fsf@blue.sea.net> (raw)
In-Reply-To: prvd3i9e.fsf@blue.sea.net
Present the options in -s|--long (short, long) order.
Mention merge and new whitespace option.
ed-off-by: Jari Aalto <jari.aalto AT cante.net>
---
***********************************************************************
Reworked patch (No. 1)
[Jakub Narebski]
> or break synopsis into lines 80-column lines max.
***********************************************************************
git-rebase.sh | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index bdcea0e..6805742 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -3,7 +3,10 @@
# Copyright (c) 2005 Junio C Hamano.
#
-USAGE='[--interactive | -i] [-v] [--onto <newbase>] <upstream> [<branch>]'
+USAGE='[-i|--interactive] [-v|--verbose]
+[--whitespace={nowarn|warn|error|error-all|strip}]
+[-m|--merge] [--onto <newbase>] <upstream> [<branch>]'
+
LONG_USAGE='git-rebase replaces <branch> with a new branch of the
same name. When the --onto option is provided the new branch starts
out with a HEAD equal to <newbase>, otherwise it is equal to <upstream>
--
1.5.4-rc5.GIT-dirty
--
Welcome to FOSS revolution: we fix and modify until it shines
next prev parent reply other threads:[~2008-02-03 23:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-03 20:19 [PATCH] git-rebase.sh: Update USAGE string Jari Aalto
2008-02-03 21:14 ` Jakub Narebski
2008-02-03 23:33 ` Jari Aalto [this message]
2008-02-03 23:41 ` [PATCH] git-rebase.sh: Update USAGE string (No. 1) Johannes Schindelin
2008-02-03 23:52 ` Jakub Narebski
2008-02-04 0:11 ` Jari Aalto
2008-02-04 0:27 ` Johannes Schindelin
2008-02-04 0:39 ` Junio C Hamano
2008-02-04 10:15 ` Jakub Narebski
2008-02-04 11:57 ` Mike Hommey
2008-02-04 12:53 ` Jakub Narebski
2008-02-04 0:24 ` Junio C Hamano
2008-02-04 8:04 ` [PATCH v3] git-rebase.sh: Update USAGE string Jari Aalto
2008-02-04 11:12 ` [PATCH] git-rebase.sh: Update USAGE string (No. 1) しらいしななこ
2008-02-04 15:06 ` rebase -i and --whitespace, was " Johannes Schindelin
2008-02-04 15:42 ` Jakub Narebski
2008-02-04 16:32 ` Johannes Schindelin
2008-02-05 23:43 ` Junio C Hamano
2008-02-06 1:00 ` Johannes Schindelin
2008-02-04 0:16 ` [PATCH v2] git-rebase.sh: Update USAGE string Jari Aalto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ir15399p.fsf@blue.sea.net \
--to=jari.aalto@cante$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox