diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:51 -0800 |
| commit | cd425a1585bf0c1b92faa772b664dadd3294bf19 (patch) | |
| tree | 55f250c9c27cf50298c7439a8ea2673d3f9e9553 /git-rebase--interactive.sh | |
| parent | 6b236bfcb011048a4c2abc6b44290c738a3de699 (diff) | |
| parent | 7baf9c4b70784920e05f9be6614084ef8f64674d (diff) | |
| download | git-cd425a1585bf0c1b92faa772b664dadd3294bf19.tar.gz | |
Merge branch 'mz/rebase-i-verify'
* mz/rebase-i-verify:
rebase: support --verify
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 5934b97fa1..a5ffd9a31e 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -28,6 +28,7 @@ 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 +verify allow pre-rebase hook to run root rebase all reachable commmits up to the root(s) autosquash move commits that begin with squash!/fixup! under -i " @@ -749,6 +750,7 @@ do OK_TO_SKIP_PRE_REBASE=yes ;; --verify) + OK_TO_SKIP_PRE_REBASE= ;; --continue) is_standalone "$@" || usage |