aboutsummaryrefslogtreecommitdiffhomepage
path: root/share
diff options
context:
space:
mode:
authorGravatar Terje Larsen <terlar@gmail.com>2012-10-22 20:50:38 +0200
committerGravatar Terje Larsen <terlar@gmail.com>2012-10-22 20:50:38 +0200
commit8dfc8625a7ac2f622bc931ce74d48f1b2a38eea6 (patch)
tree50e9eb1a2cc48c2fd46e21dbf8c5ebfbfd505f78 /share
parente878947cb2b211d500c5aecdd0027d21ffb9c350 (diff)
Add git completions for tracking (branch/checkout)
Diffstat (limited to 'share')
-rw-r--r--share/completions/git.fish6
1 files changed, 5 insertions, 1 deletions
diff --git a/share/completions/git.fish b/share/completions/git.fish
index b39ae124..2dde6f84 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -93,6 +93,7 @@ complete -f -c git -n '__fish_git_needs_command' -a checkout -d 'Checkout and
complete -f -c git -n '__fish_git_using_command checkout' -a '(__fish_git_branches)' --description 'Branch'
complete -f -c git -n '__fish_git_using_command checkout' -a '(__fish_git_tags)' --description 'Tag'
complete -f -c git -n '__fish_git_using_command checkout' -s b -d 'Create a new branch'
+complete -f -c git -n '__fish_git_using_command checkout' -s t -l track -d 'Track a new branch'
# TODO options
### apply
@@ -110,11 +111,14 @@ complete -f -c git -n '__fish_git_needs_command' -a bisect -d 'Find the change t
### branch
complete -f -c git -n '__fish_git_needs_command' -a branch -d 'List, create, or delete branches'
complete -f -c git -n '__fish_git_using_command branch' -a '(__fish_git_branches)' -d 'Branch'
-complete -f -c git -n '__fish_git_using_command branch' -s d -d 'Delete Branch'
+complete -f -c git -n '__fish_git_using_command branch' -s d -d 'Delete branch'
complete -f -c git -n '__fish_git_using_command branch' -s D -d 'Force deletion of branch'
complete -f -c git -n '__fish_git_using_command branch' -s m -d 'Rename branch'
complete -f -c git -n '__fish_git_using_command branch' -s M -d 'Force renaming branch'
complete -f -c git -n '__fish_git_using_command branch' -s a -d 'Lists both local and remote branches'
+complete -f -c git -n '__fish_git_using_command branch' -s t -l track -d 'Track remote branch'
+complete -f -c git -n '__fish_git_using_command branch' -l no-track -d 'Do not track remote branch'
+complete -f -c git -n '__fish_git_using_command branch' -l set-upstream -d 'Set remote branch to track'
### cherry-pick
complete -f -c git -n '__fish_git_needs_command' -a cherry-pick -d 'Apply the change introduced by an existing commit'