diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-09-06 02:01:14 +0200 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2013-09-06 21:48:00 +0100 |
| commit | a4245da9998029e27d8ab58f1fb350a499b04983 (patch) | |
| tree | 425c92e52460e95dd1bf4b78ce7f4a1a8d51b7ea | |
| parent | c866657a3cfd8a82d3c6ee06ff193a0c927b299f (diff) | |
| download | zsh-a4245da9998029e27d8ab58f1fb350a499b04983.tar.gz zsh-a4245da9998029e27d8ab58f1fb350a499b04983.tar.xz zsh-a4245da9998029e27d8ab58f1fb350a499b04983.zip | |
31702: check for git rebase -i for autosquash
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 0e8809ad3..094956989 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2013-09-06 Peter Stephenson <p.w.stephenson@ntlworld.com> + * Luka Perkov: 31702: Completion/Unix/Command/_git: + check for presence of "-i" when checking for "--interactive". + * 31706: Src/builtin.c, Test/C02cond.ztst: standardise handling of "test ! <x> <y> <z>". diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index db59a9b75..144869836 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1182,7 +1182,7 @@ _git-push () { _git-rebase () { local -a autosquash_opts - if (( words[(I)--interactive] )); then + 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]') |