X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase--interactive.sh;h=a5ffd9a31eea0f361774d77867c83f444847279b;hb=3f246b1cef2c568bbac1f71c25fbf8045ff6448a;hp=5934b97fa106d73b1b091f050272c4c9f25eb646;hpb=f04aa35eb6117d99f5abf9630961b2c2651d3ed1;p=git.git diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 5934b97fa..a5ffd9a31 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