diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2007-09-25 18:58:16 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2007-09-25 18:58:16 +0000 |
| commit | c92f9a73bb99e6d0f82f6cea7eedf3865b6bd311 (patch) | |
| tree | 1e10b7d5ec1b68c3862471efd0b0de3df883e62b | |
| parent | 9433977a83f67cab603922f2bfc3f65ee6e2a096 (diff) | |
| download | zsh-c92f9a73bb99e6d0f82f6cea7eedf3865b6bd311.tar.gz zsh-c92f9a73bb99e6d0f82f6cea7eedf3865b6bd311.tar.xz zsh-c92f9a73bb99e6d0f82f6cea7eedf3865b6bd311.zip | |
Mikael Magnusson: 23832: fix git merge -m completion.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 64117ced5..b80bda16b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-09-25 Clint Adams <clint@zsh.org> + * Mikael Magnusson: 23832: Completion/Unix/Command/_git: + fix git merge -m completion. + * 23831: Completion/Unix/Command/_git: fix handling of merge strategy option. 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 } |