mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'mz/rebase-i-verify'
* mz/rebase-i-verify: rebase: support --verify
This commit is contained in:
commit
cd425a1585
|
@ -279,6 +279,10 @@ which makes little sense.
|
|||
--no-verify::
|
||||
This option bypasses the pre-rebase hook. See also linkgit:githooks[5].
|
||||
|
||||
--verify::
|
||||
Allows the pre-rebase hook to run, which is the default. This option can
|
||||
be used to override --no-verify. 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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -206,6 +206,9 @@ do
|
|||
--no-verify)
|
||||
OK_TO_SKIP_PRE_REBASE=yes
|
||||
;;
|
||||
--verify)
|
||||
OK_TO_SKIP_PRE_REBASE=
|
||||
;;
|
||||
--continue)
|
||||
test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
|
||||
die "No rebase in progress?"
|
||||
|
|
Loading…
Reference in a new issue