diff --git a/bin/git-abort b/bin/git-abort index abc3ed7..9c17380 100755 --- a/bin/git-abort +++ b/bin/git-abort @@ -3,7 +3,7 @@ gitdir="$(git rev-parse --git-dir)" || exit opfound= fcnt= -for i in cherry-pick merge rebase; do +for i in cherry-pick merge rebase revert; do f=${i^^} f=${f/-/_} test -f "${gitdir}/${f}_HEAD" && fcnt=1$fcnt && opfound=$i diff --git a/man/git-abort.1 b/man/git-abort.1 index a4704c0..cd998a2 100644 --- a/man/git-abort.1 +++ b/man/git-abort.1 @@ -6,7 +6,7 @@ .SH "SYNOPSIS" \fBgit\-abort\fR .SH "DESCRIPTION" -Abort current git rebase, merge or cherry\-pick process\. +Abort current git revert, rebase, merge or cherry\-pick process\. .SH "OPTIONS" There are no options, it just aborts current operation\. .SH "EXAMPLES" diff --git a/man/git-abort.html b/man/git-abort.html index 697537a..983b28e 100644 --- a/man/git-abort.html +++ b/man/git-abort.html @@ -81,7 +81,7 @@
Abort current git rebase, merge or cherry-pick process.
+Abort current git revert, rebase, merge or cherry-pick process.