Skip to content

Commit

Permalink
Update docs for git abort change (#1000)
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuali925 authored Oct 17, 2022
1 parent 71af8ce commit 2d1aa6d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -1565,7 +1565,7 @@ Note above, that because of the `--newer` flag, the file `git-alias` was not tou
## git abort
Abort current rebase, merge or cherry-pick, without the need to find exact command in history.
Abort current revert, rebase, merge or cherry-pick, without the need to find exact command in history.
## git magic
Expand Down
2 changes: 1 addition & 1 deletion etc/git-extras-completion.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ zstyle -g existing_user_commands ':completion:*:*:git:*' user-commands

zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
alias:'define, search and show aliases' \
abort:'abort current merge, rebase, or cherry-pick process' \
abort:'abort current revert, merge, rebase, or cherry-pick process' \
archive-file:'export the current head of the git repository to an archive' \
authors:'generate authors report' \
browse:'open repo website in browser' \
Expand Down

0 comments on commit 2d1aa6d

Please sign in to comment.