diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-09-07 02:01:03 +0200 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2013-09-07 10:09:11 +0200 |
| commit | c7213566462e2a7279e19a22027fa23b21c8e722 (patch) | |
| tree | dfb6c15f5c8e9e8584469fb6b930a59d0ea2479d | |
| parent | a4245da9998029e27d8ab58f1fb350a499b04983 (diff) | |
| download | zsh-c7213566462e2a7279e19a22027fa23b21c8e722.tar.gz zsh-c7213566462e2a7279e19a22027fa23b21c8e722.tar.xz zsh-c7213566462e2a7279e19a22027fa23b21c8e722.zip | |
31708: _git: add --fixup and --squash options to commit
Signed-off-by: Luka Perkov <luka@openwrt.org>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 094956989..b8302c199 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-09-07 Luka Perkov <luka@openwrt.org> + + * 31708: Completion/Unix/Command/_git: _git: add --fixup and + --squash options to commit + 2013-09-06 Peter Stephenson <p.w.stephenson@ntlworld.com> * Luka Perkov: 31702: Completion/Unix/Command/_git: diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 144869836..a24069a0e 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -591,6 +591,8 @@ _git-commit () { # TODO: --interactive isn’t explicitly listed in the documentation. _arguments -w -S -s \ '(-a --all --interactive -o --only -i --include *)'{-a,--all}'[stage all modified and deleted paths]' \ + '--fixup=[construct a commit message for use with rebase --autosquash]:' \ + '--squash=[construct a commit message for use with rebase --autosquash]:' \ $reset_author_opt \ '( --porcelain --dry-run)--short[output dry run in short format]' \ '(--short --dry-run)--porcelain[output dry run in porcelain-ready format]' \ |