summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-07 12:56:33 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-07 12:56:33 -0800
commit53828bb0654da620ed24bf50c721b6909f487daa (patch)
treec8e53473144ef4129e70aa76dd854b1fd1709d61
parentSync with maint (diff)
parentcompletion: --edit-description option for git-branch (diff)
downloadtgif-53828bb0654da620ed24bf50c721b6909f487daa.tar.xz
Merge branch 'rt/completion-branch-edit-desc'
* rt/completion-branch-edit-desc: completion: --edit-description option for git-branch
-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 78be195838..a2965f7c6d 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
"
;;
*)