From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Mon, 13 Oct 2008 23:17:16 +0000 (+0900)
Subject: rebase: Document --no-verify option to bypass pre-rebase hook
X-Git-Tag: v1.6.1-rc1~135^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fd631d5828ec6b89e86e0568e5e798787fed9bbd;p=git.git

rebase: Document --no-verify option to bypass pre-rebase hook

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 32f0f122e..4e8438098 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