summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-11 09:29:59 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-11 09:29:59 -0700
commite356158b4ac80f93df425337d512fa9085a853ac (patch)
tree854488a92795faa55cc494d1a7e8005f5469d7f6 /contrib
parent43262d8d6511212f49d519779505f8a557c8dc84 (diff)
parent956352b67e1abea342ba7468ac4708ad3ab9970e (diff)
downloadgit-e356158b4ac80f93df425337d512fa9085a853ac.tar.gz
Merge branch 'tb/complete-sequencing'
The bash completion script (in contrib/) learned a few options that "git revert" takes. * tb/complete-sequencing: completion: suggest sequencer commands for revert
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash5
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index bfc74e9d57..3c00acda63 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2282,6 +2282,11 @@ _git_reset ()
_git_revert ()
{
+ local dir="$(__gitdir)"
+ if [ -f "$dir"/REVERT_HEAD ]; then
+ __gitcomp "--continue --quit --abort"
+ return
+ fi
case "$cur" in
--*)
__gitcomp "--edit --mainline --no-edit --no-commit --signoff"