Merge branch 'as/log-output-encoding-in-user-format'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8fbf94103cf458cba18b239a11abecec0239ff17..fa3ae1e8535c786dc724ab7a73cccb6f3bfca8de 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -33,8 +33,6 @@ esac
 # returns location of .git repo
 __gitdir ()
 {
-       # Note: this function is duplicated in git-prompt.sh
-       # When updating it, make sure you update the other one to match.
        if [ -z "${1-}" ]; then
                if [ -n "${__git_dir-}" ]; then
                        echo "$__git_dir"
@@ -2513,6 +2511,7 @@ __git_main ()
                        --exec-path
                        --exec-path=
                        --html-path
+                       --man-path
                        --info-path
                        --work-tree=
                        --namespace=