File tree 1 file changed +28
-0
lines changed
1 file changed +28
-0
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,8 @@ __git_imerge_commands="\
19
19
start
20
20
merge
21
21
rebase
22
+ drop
23
+ revert
22
24
continue
23
25
finish
24
26
diagram
@@ -67,6 +69,13 @@ __git_imerge_merge_options="\
67
69
--manual
68
70
"
69
71
72
+ __git_imerge_drop_options="\
73
+ --help
74
+ --name
75
+ --branch
76
+ --manual
77
+ "
78
+
70
79
__git_imerge_list_options="\
71
80
--help
72
81
"
@@ -99,6 +108,8 @@ __git_imerge_remove_options=$__git_imerge_autofill_options
99
108
100
109
__git_imerge_rebase_options=$__git_imerge_merge_options
101
110
111
+ __git_imerge_revert_options=$__git_imerge_drop_options
112
+
102
113
__git-imerge_start_completion() {
103
114
case "$1_$cur" in
104
115
--help_|--branch_|_--branch=|--name_|_--name=)
@@ -179,6 +190,23 @@ __git-imerge_rebase_completion() {
179
190
__git-imerge_merge_completion $1
180
191
}
181
192
193
+ __git-imerge_drop_completion() {
194
+ case "$1_$cur" in
195
+ --help_|--branch_|_--branch=|--name_|_--name=)
196
+ return
197
+ ;;
198
+ *-|*_-*?)
199
+ __gitcomp "$__git_imerge_merge_options"
200
+ return
201
+ ;;
202
+ esac
203
+ __gitcomp "$(__git_imerge_branches)"
204
+ }
205
+
206
+ __git-imerge_revert_completion() {
207
+ __git-imerge_drop_completion $1
208
+ }
209
+
182
210
__git-imerge_list_completion() {
183
211
case "$1" in
184
212
--help)
You can’t perform that action at this time.
0 commit comments