utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 07:26:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Include revert conflicts in git abort (#992)

Browse source
This commit is contained in:
Joshua Li 2022-10-05 22:26:20 -07:00 committed by GitHub
parent 8058b1718f
commit 06aa5dbb1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/git-abort
View file

@ -3,7 +3,7 @@
gitdir="$(git rev-parse --git-dir)" || exit gitdir="$(git rev-parse --git-dir)" || exit
opfound= opfound=
fcnt= fcnt=
for i in cherry-pick merge rebase; do for i in cherry-pick merge rebase revert; do
f=${i^^} f=${i^^}
f=${f/-/_} f=${f/-/_}
test -f "${gitdir}/${f}_HEAD" && fcnt=1$fcnt && opfound=$i test -f "${gitdir}/${f}_HEAD" && fcnt=1$fcnt && opfound=$i

2
man/git-abort.1
View file

@ -6,7 +6,7 @@
.SH "SYNOPSIS" .SH "SYNOPSIS"
\fBgit\-abort\fR \fBgit\-abort\fR
.SH "DESCRIPTION" .SH "DESCRIPTION"
Abort current git rebase, merge or cherry\-pick process\. Abort current git revert, rebase, merge or cherry\-pick process\.
.SH "OPTIONS" .SH "OPTIONS"
There are no options, it just aborts current operation\. There are no options, it just aborts current operation\.
.SH "EXAMPLES" .SH "EXAMPLES"

2
man/git-abort.html
View file

@ -81,7 +81,7 @@
<h2 id="DESCRIPTION">DESCRIPTION</h2> <h2 id="DESCRIPTION">DESCRIPTION</h2>
<p> Abort current git rebase, merge or cherry-pick process.</p> <p> Abort current git revert, rebase, merge or cherry-pick process.</p>
<h2 id="OPTIONS">OPTIONS</h2> <h2 id="OPTIONS">OPTIONS</h2>

2
man/git-abort.md
View file

@ -7,7 +7,7 @@ git-abort(1) -- Abort current git operation
## DESCRIPTION ## DESCRIPTION
Abort current git rebase, merge or cherry-pick process. Abort current git revert, rebase, merge or cherry-pick process.
## OPTIONS ## OPTIONS