Merge branch 'jc/blame-follows-renames' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ee4c0a07aedb9c587879f7a7bbf1193a24cdd8a2..5b255cba69661a2f4d5b6cfa9dbc6a171c5f91ee 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1014,7 +1014,8 @@ _git_commit ()
        --*)
                __gitcomp "
                        --all --author= --signoff --verify --no-verify
-                       --edit --amend --include --only --interactive
+                       --edit --no-edit
+                       --amend --include --only --interactive
                        --dry-run --reuse-message= --reedit-message=
                        --reset-author --file= --message= --template=
                        --cleanup= --untracked-files --untracked-files=