From: Michele Ballabio <barra_cuda@katamail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org
Subject: [PATCH v2 2/3] document --force-rebase
Date: Wed, 18 Mar 2009 21:53:39 +0100 [thread overview]
Message-ID: <1237409619-4229-1-git-send-email-barra_cuda@katamail.com> (raw)
In-Reply-To: <7v63i6fzgc.fsf@gitster.siamese.dyndns.org>
Words by Junio.
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
---
Documentation/git-rebase.txt | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 57bd333..276f151 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -258,6 +258,13 @@ OPTIONS
context exist they all must match. By default no context is
ever ignored.
+-f::
+--force-rebase::
+ Force the rebase even if the current branch is a descendant
+ of the commit you are rebasing onto. Normally the command will
+ exit with the message "Current branch is up to date" in such a
+ situation.
+
--whitespace=<option>::
This flag is passed to the 'git-apply' program
(see linkgit:git-apply[1]) that applies the patch.
--
1.6.2.22.gc2ac
next prev parent reply other threads:[~2009-03-18 20:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-18 18:05 [PATCH 1/3] rebase: fix typo (force_rebas -> force-rebas) Michele Ballabio
2009-03-18 18:05 ` [PATCH 2/3] document --force-rebase Michele Ballabio
2009-03-18 18:38 ` Junio C Hamano
2009-03-18 18:38 ` Junio C Hamano
2009-03-18 20:53 ` Michele Ballabio [this message]
2009-03-18 21:15 ` [PATCH v2 " Johannes Schindelin
2009-03-19 11:01 ` [PATCH " Sverre Rabbelier
2009-03-19 15:28 ` [PATCH v3 " Michele Ballabio
2009-03-19 15:28 ` [PATCH v3 3/3] rebase: add options passed to git-am Michele Ballabio
2009-03-18 18:05 ` [PATCH " Michele Ballabio
2009-03-18 18:41 ` Junio C Hamano
2009-03-18 20:53 ` [PATCH v2 " Michele Ballabio
2009-03-27 18:58 ` [PATCH 1/3] rebase: fix typo (force_rebas -> force-rebas) Michele Ballabio
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=1237409619-4229-1-git-send-email-barra_cuda@katamail.com \
--to=barra_cuda@katamail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).