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
git-mirror · Jun 11, 2015 · e356158 · e356158
2 parents 43262d8 + 956352b
commit e356158
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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"