diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:05:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:05:58 -0700 |
| commit | ce6e5ff435f325769dd28980cf3c8b1625f194f2 (patch) | |
| tree | a903e06ed0f4cfb9fb1f8f484907baa57b7d2b0a /git-rebase--interactive.sh | |
| parent | 3aa615bc5d5348d732b5b1354cc3517a55b34a6f (diff) | |
| parent | fd631d5828ec6b89e86e0568e5e798787fed9bbd (diff) | |
| download | git-ce6e5ff435f325769dd28980cf3c8b1625f194f2.tar.gz git-ce6e5ff435f325769dd28980cf3c8b1625f194f2.tar.xz | |
Merge branch 'ns/rebase-noverify'
* ns/rebase-noverify:
rebase: Document --no-verify option to bypass pre-rebase hook
rebase --no-verify
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 124cb5846..86290f63b 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -26,6 +26,7 @@ i,interactive always used (no-op) continue continue rebasing process abort abort rebasing process and restore original branch skip skip current patch and continue rebasing process +no-verify override pre-rebase hook from stopping the operation " . git-sh-setup @@ -41,6 +42,7 @@ PRESERVE_MERGES= STRATEGY= ONTO= VERBOSE= +OK_TO_SKIP_PRE_REBASE= GIT_CHERRY_PICK_HELP=" After resolving the conflicts, mark the corrected paths with 'git add <paths>', and @@ -66,7 +68,8 @@ output () { } run_pre_rebase_hook () { - if test -x "$GIT_DIR/hooks/pre-rebase" + if test -z "$OK_TO_SKIP_PRE_REBASE" && + test -x "$GIT_DIR/hooks/pre-rebase" then "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || { echo >&2 "The pre-rebase hook refused to rebase." @@ -421,6 +424,11 @@ get_saved_options () { while test $# != 0 do case "$1" in + --no-verify) + OK_TO_SKIP_PRE_REBASE=yes + ;; + --verify) + ;; --continue) is_standalone "$@" || usage get_saved_options |