about summary refs log tree commit diff
path: root/Completion/Unix/Command/_git
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2007-09-25 18:58:16 +0000
committerClint Adams <clint@users.sourceforge.net>2007-09-25 18:58:16 +0000
commitc92f9a73bb99e6d0f82f6cea7eedf3865b6bd311 (patch)
tree1e10b7d5ec1b68c3862471efd0b0de3df883e62b /Completion/Unix/Command/_git
parent9433977a83f67cab603922f2bfc3f65ee6e2a096 (diff)
downloadzsh-c92f9a73bb99e6d0f82f6cea7eedf3865b6bd311.tar.gz
zsh-c92f9a73bb99e6d0f82f6cea7eedf3865b6bd311.tar.xz
zsh-c92f9a73bb99e6d0f82f6cea7eedf3865b6bd311.zip
Mikael Magnusson: 23832: fix git merge -m completion.
Diffstat (limited to 'Completion/Unix/Command/_git')
-rw-r--r--Completion/Unix/Command/_git2
1 files changed, 1 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 62b236189..b89b0c97a 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1663,7 +1663,7 @@ _git-ls-remote () {
 _git-merge () {
   _arguments \
     "$merge_args[@]" \
-    ':merge message' \
+    '-m:merge message' \
     '*:remote:__git_commits' && ret=0
 }