From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Mon, 13 Oct 2008 23:17:16 GMT
Subject: [PATCH] rebase: Document --no-verify option to bypass pre-rebase hook
Message-ID: <20081014081716.6117@nanako3.lavabit.com>
In-Reply-To: <20081012212543.GG4856@spearce.org>

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
---

"Shawn O. Pearce" <spearce@spearce.org> writes:

> * ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit
>  + rebase --no-verify
>
> This adds --no-verify to git rebase, to avoid the pre-rebase hook.
> Lacks documentation but otherwise looks sound.

Here it is.

 Documentation/git-rebase.txt |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 32f0f12..4e84380 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git rebase' [-i | --interactive] [-v | --verbose] [-m | --merge]
-	[-s <strategy> | --strategy=<strategy>]
+	[-s <strategy> | --strategy=<strategy>] [--no-verify]
 	[-C<n>] [ --whitespace=<option>] [-p | --preserve-merges]
 	[--onto <newbase>] <upstream> [<branch>]
 'git rebase' --continue | --skip | --abort
@@ -232,6 +232,9 @@ OPTIONS
 --verbose::
 	Display a diffstat of what changed upstream since the last rebase.
 
+--no-verify::
+	This option bypasses the pre-rebase hook.  See also linkgit:githooks[5].
+
 -C<n>::
 	Ensure at least <n> lines of surrounding context match before
 	and after each change.  When fewer lines of surrounding
-- 
1.6.0.2

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/