From 9eb112f6d97be63a00df36574a0e5fc37b83766c Mon Sep 17 00:00:00 2001
From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mon, 12 Sep 2016 10:17:20 +0200
Subject: [PATCH] Add bash completion for new `drop` and `revert` commands

---
 git-imerge.bashcomplete | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/git-imerge.bashcomplete b/git-imerge.bashcomplete
index bfc451e..1b8ed3a 100644
--- a/git-imerge.bashcomplete
+++ b/git-imerge.bashcomplete
@@ -19,6 +19,8 @@ __git_imerge_commands="\
 start
 merge
 rebase
+drop
+revert
 continue
 finish
 diagram
@@ -67,6 +69,13 @@ __git_imerge_merge_options="\
 --manual
 "
 
+__git_imerge_drop_options="\
+--help
+--name
+--branch
+--manual
+"
+
 __git_imerge_list_options="\
 --help
 "
@@ -99,6 +108,8 @@ __git_imerge_remove_options=$__git_imerge_autofill_options
 
 __git_imerge_rebase_options=$__git_imerge_merge_options
 
+__git_imerge_revert_options=$__git_imerge_drop_options
+
 __git-imerge_start_completion() {
 	case "$1_$cur" in
 	--help_|--branch_|_--branch=|--name_|_--name=)
@@ -179,6 +190,23 @@ __git-imerge_rebase_completion() {
 	__git-imerge_merge_completion $1
 }
 
+__git-imerge_drop_completion() {
+	case "$1_$cur" in
+	--help_|--branch_|_--branch=|--name_|_--name=)
+		return
+		;;
+	*-|*_-*?)
+		__gitcomp "$__git_imerge_merge_options"
+		return
+		;;
+	esac
+	__gitcomp "$(__git_imerge_branches)"
+}
+
+__git-imerge_revert_completion() {
+	__git-imerge_drop_completion $1
+}
+
 __git-imerge_list_completion() {
 	case "$1" in
 	--help)