Merge branch 'db/doc-custom-xmlto'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1b43329ed79bfb09eac7a017c5ab7466fedc497b..be800e09bdf0656951c415105e0d32ce0b0edf9e 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1018,7 +1018,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=