summary refs log tree commit diff
path: root/Completion/Unix/Command/_git
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2007-07-02 15:47:53 +0000
committerClint Adams <clint@users.sourceforge.net>2007-07-02 15:47:53 +0000
commit58b9d6573dbfeec21a9087a7190b17f5e082f184 (patch)
tree64880f880a8a538f79741b55a1460b88ed7fdc8f /Completion/Unix/Command/_git
parent2dfb0d5af4f8e5dae544c520802f3ba05a90b071 (diff)
downloadzsh-58b9d6573dbfeec21a9087a7190b17f5e082f184.tar.gz
zsh-58b9d6573dbfeec21a9087a7190b17f5e082f184.tar.xz
zsh-58b9d6573dbfeec21a9087a7190b17f5e082f184.zip
23639: merge in git merge-tree completion from Nikolai Weibull's repository.
Diffstat (limited to 'Completion/Unix/Command/_git')
-rw-r--r--Completion/Unix/Command/_git10
1 files changed, 9 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 16be9ef0e..4d275a22c 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1,4 +1,4 @@
-#compdef git git-annotate git-apply git-checkout-index git-clean git-commit-tree git-describe git-hash-object git-index-pack git-init-db git-merge-index git-mktag git-mktree git-pack-objects git-prune-packed git-read-tree git-unpack-objects git-update-index git-write-tree git-cat-file git-diff-index git-diff-files git-diff-stages git-diff-tree git-fsck-objects git-ls-files git-ls-tree git-merge-base git-name-rev git-rev-list git-show-index git-tar-tree git-unpack-file git-var git-verify-pack git-clone-pack git-fetch-pack git-http-fetch git-local-fetch git-peek-remote git-receive-pack git-send-pack git-ssh-fetch git-ssh-upload git-update-server-info git-upload-pack git-add git-am git-applymbox git-bisect git-branch git-checkout git-cherry-pick git-clone git-commit git-diff git-fetch git-format-patch git-grep git-log git-ls-remote git-merge git-mv git-octopus git-pull git-push git-rebase git-repack git-reset git-resolve git-revert git-shortlog git-show-branch git-status git-verify-tag git-whatchanged git-applypatch git-archimport git-archive git-convert-objects git-cvsimport git-lost-found git-merge-one-file git-prune git-relink git-svnimport git-symbolic-ref git-tag git-update-ref git-check-ref-format git-cherry git-count-objects git-daemon git-get-tar-commit-id git-mailinfo git-mailsplit git-patch-id git-request-pull git-send-email git-stripspace
+#compdef git git-annotate git-apply git-checkout-index git-clean git-commit-tree git-describe git-hash-object git-index-pack git-init-db git-merge-index git-merge-tree git-mktag git-mktree git-pack-objects git-prune-packed git-read-tree git-unpack-objects git-update-index git-write-tree git-cat-file git-diff-index git-diff-files git-diff-stages git-diff-tree git-fsck-objects git-ls-files git-ls-tree git-merge-base git-name-rev git-rev-list git-show-index git-tar-tree git-unpack-file git-var git-verify-pack git-clone-pack git-fetch-pack git-http-fetch git-local-fetch git-peek-remote git-receive-pack git-send-pack git-ssh-fetch git-ssh-upload git-update-server-info git-upload-pack git-add git-am git-applymbox git-bisect git-branch git-checkout git-cherry-pick git-clone git-commit git-diff git-fetch git-format-patch git-grep git-log git-ls-remote git-merge git-mv git-octopus git-pull git-push git-rebase git-repack git-reset git-resolve git-revert git-shortlog git-show-branch git-status git-verify-tag git-whatchanged git-applypatch git-archimport git-archive git-convert-objects git-cvsimport git-lost-found git-merge-one-file git-prune git-relink git-svnimport git-symbolic-ref git-tag git-update-ref git-check-ref-format git-cherry git-count-objects git-daemon git-get-tar-commit-id git-mailinfo git-mailsplit git-patch-id git-request-pull git-send-email git-stripspace
 
 # Commands not completed:
 # git-sh-setup
@@ -132,6 +132,7 @@ _git_commands () {
     'merge-base:finds a good common ancestor as possible for a merge'
     'merge-index:runs a merge for files needing merging'
     'merge-one-file:standard helper-program to use with merge-index'
+    'merge-tree:show three-way merge without touching index'
     'mktag:creates a tag object'
     'mktree:build tree-object from ls-tree formatted text'
     'mv:moves or renames a file, directory, or symlink'
@@ -308,6 +309,13 @@ _git-merge-index () {
   fi
 }
 
+_git-merge-tree () {
+  _arguments \
+    ':base-tree:__git_tree_ishs' \
+    ':branch 1:__git_tree_ishs' \
+    ':branch 2:__git_tree_ishs' && ret=0
+}
+
 _git-mktag () {
   _message 'no arguments allowed; only accepts tags on standard input'
 }