diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 11 |
2 files changed, 5 insertions, 9 deletions
@@ -1,5 +1,8 @@ 2025-01-30 Oliver Kiddle <opk@zsh.org> + * github #118: Eisuke Kawashima: Completion/Unix/Command/_git: + git rebase non-interactive mode also supports --autosquash + * 53338: Completion/Zsh/Command/_typeset: complete typeset -n option * 53337: Doc/Zsh/mod_ksh93.yo, Src/Modules/ksh93.c: allow nameref -p diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index a442b45d2..702360ef3 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1565,14 +1565,6 @@ _git-range-diff () { (( $+functions[_git-rebase] )) || _git-rebase () { - local -a autosquash_opts - - if (( words[(I)-i|--interactive] )); then - autosquash_opts=( - '( --no-autosquash)--autosquash[check for auto-squash boundaries]' - '(--autosquash )--no-autosquash[do not check for auto-squash boundaries]') - fi - _arguments -s -S $endopt \ - actions \ '(-)--continue[continue after resolving merge conflict]' \ @@ -1605,7 +1597,8 @@ _git-rebase () { '(--apply --whitespace -C)*'{-s+,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies' \ '(--apply --whitespace -C)*'{-X+,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]: :_git_strategy_options' \ '(1 --keep-base --fork-point)--root[rebase all reachable commits]' \ - $autosquash_opts \ + '(--no-autosquash)--autosquash[check for auto-squash boundaries]' \ + "(--autosquash)--no-autosquash[don't check for auto-squash boundaries]" \ '(--autostash --no-autostash)--autostash[stash uncommitted changes before rebasing and apply them afterwards]' \ "(--autostash --no-autostash)--no-autostash[don't stash uncommitted changes before rebasing and apply them afterwards]" \ '(--root)--fork-point[use merge-base --fork-point to refine upstream]' \ |