From 2d1aa6daea420b74b305567ab0c5ae0094c336cd Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Mon, 17 Oct 2022 00:45:52 -0700 Subject: [PATCH] Update docs for git abort change (#1000) --- Commands.md | 2 +- etc/git-extras-completion.zsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Commands.md b/Commands.md index a644e45..fac3a3a 100644 --- a/Commands.md +++ b/Commands.md @@ -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 diff --git a/etc/git-extras-completion.zsh b/etc/git-extras-completion.zsh index c35574a..8535a1c 100644 --- a/etc/git-extras-completion.zsh +++ b/etc/git-extras-completion.zsh @@ -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' \