diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 2e2a014c0..a9cc4e3f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-02-02 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 34444: Completion/Unix/Command/_git: git completion: minor + improvements to 'commit' and 'rebase' + 2015-02-01 Barton E. Schaefer <schaefer@zsh.org> * 34446: Doc/Zsh/mod_db_gdbm.yo, Src/Modules/db_gdbm.c: add diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index afdd281d2..9a78bf48c 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -651,8 +651,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]:' \ + '--fixup=[construct a commit message for use with rebase --autosquash]:commit to be amended:' \ + '--squash=[construct a commit message for use with rebase --autosquash]:commit to be amended:' \ $reset_author_opt \ '( --porcelain --dry-run)--short[output dry run in short format]' \ '(--short --dry-run)--porcelain[output dry run in porcelain-ready format]' \ @@ -1339,13 +1339,13 @@ _git-rebase () { '(-i --interactive --ignore-whitespace --whitespace --committer-date-is-author-date)'{-i,--interactive}'[make a list of commits to be rebased and open in $EDITOR]' \ '--edit-todo[edit interactive instruction sheet in an editor]' \ '(-p --preserve-merges --interactive)'{-p,--preserve-merges}'[try to recreate merges instead of ignoring them]' \ - {-x,--exec}'[with -i\: append "exec <cmd>" after each line]:command' \ + {-x,--exec=}'[with -i\: append "exec <cmd>" after each line]:command' \ '(1)--root[rebase all reachable commits]' \ $autosquash_opts \ '(--autostash --no-autostash)--autostash[stash uncommitted changes before rebasing and apply them afterwards]' \ '(--autostash --no-autostash)--no-autostash[do not stash uncommitted changes before rebasing and apply them afterwards]' \ '--no-ff[cherry-pick all rebased commits with --interactive, otherwise synonymous to --force-rebase]' \ - '--onto[start new branch with HEAD equal to given revision]:newbase:__git_revisions' \ + '--onto=[start new branch with HEAD equal to given revision]:newbase:__git_revisions' \ ':upstream branch:__git_revisions' \ '::working branch:__git_branch_names' } |