diff options
| author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-10-14 08:17:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-14 16:50:32 -0700 |
| commit | fd631d5828ec6b89e86e0568e5e798787fed9bbd (patch) | |
| tree | 59d119fa05abc1df8dfd141807c79e45cc0de015 | |
| parent | c44276563f96bba7133e3ee4144b7e0364d499b9 (diff) | |
| download | git-fd631d5828ec6b89e86e0568e5e798787fed9bbd.tar.gz | |
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>
| -rw-r--r-- | 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 32f0f122e9..4e8438098f 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 |