Merge branch 'rt/completion-branch-edit-desc' into maint

* rt/completion-branch-edit-desc:
  completion: --edit-description option for git-branch

diff --combined contrib/completion/git-completion.bash
index 78be1958383da7cc2fd1ec22e3cd02e972874eb1,e44eefdf1c55198351cf1e73de976aba701cd49d..a2965f7c6da087acc60b901befe2529a44446647
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1152,7 -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
                        "
                ;;
        *)
@@@ -1622,7 -1622,7 +1622,7 @@@ _git_log (
  
  __git_merge_options="
        --no-commit --no-stat --log --no-log --squash --strategy
 -      --commit --stat --no-squash --ff --no-ff --ff-only
 +      --commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
  "
  
  _git_merge ()