From c7213566462e2a7279e19a22027fa23b21c8e722 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sat, 7 Sep 2013 02:01:03 +0200 Subject: 31708: _git: add --fixup and --squash options to commit Signed-off-by: Luka Perkov --- ChangeLog | 5 +++++ Completion/Unix/Command/_git | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 094956989..b8302c199 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-09-07 Luka Perkov + + * 31708: Completion/Unix/Command/_git: _git: add --fixup and + --squash options to commit + 2013-09-06 Peter Stephenson * 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]' \ -- cgit 1.4.1