summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-16 20:33:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-16 20:33:46 (GMT)
commit5639786f3017711d2e38d2a02714afd0c30d7a37 (patch)
tree9099c144d348e2beb863b44094e59b3afc6f3b44 /contrib
parent90020e3bcd2108baecc79144319c86ad865c8c5e (diff)
parent48c07d868419f1597e87dcb4743a0a9f5828daa9 (diff)
downloadgit-5639786f3017711d2e38d2a02714afd0c30d7a37.zip
git-5639786f3017711d2e38d2a02714afd0c30d7a37.tar.gz
git-5639786f3017711d2e38d2a02714afd0c30d7a37.tar.bz2
Merge branch 'rt/completion-branch-edit-desc' into maint
* rt/completion-branch-edit-desc: completion: --edit-description option for git-branch
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 78be195..a2965f7 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1152,7 +1152,7 @@ _git_branch ()
__gitcomp "
--color --no-color --verbose --abbrev= --no-abbrev
--track --no-track --contains --merged --no-merged
- --set-upstream
+ --set-upstream --edit-description
"
;;
*)