diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-20 03:05:58 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-20 03:05:58 +0400 |
| commit | ce6e5ff435f325769dd28980cf3c8b1625f194f2 (patch) | |
| tree | a903e06ed0f4cfb9fb1f8f484907baa57b7d2b0a /Documentation | |
| parent | 3aa615bc5d5348d732b5b1354cc3517a55b34a6f (diff) | |
| parent | fd631d5828ec6b89e86e0568e5e798787fed9bbd (diff) | |
Merge branch 'ns/rebase-noverify'
* ns/rebase-noverify:
rebase: Document --no-verify option to bypass pre-rebase hook
rebase --no-verify
Diffstat (limited to 'Documentation')
| -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 |