Merge branch 'jk/maint-commit-document-editmsg'

diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 8e2e9f30c326ad060e4fef515b6659a1b20a67d1..29b1ec9eb1797e0f2c3c9f7067222432150ba85f 100644 (file)
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -53,6 +53,8 @@
 # returns location of .git repo
 __gitdir ()
 {
+       # Note: this function is duplicated in git-completion.bash
+       # When updating it, make sure you update the other one to match.
        if [ -z "${1-}" ]; then
                if [ -n "${__git_dir-}" ]; then
                        echo "$__git_dir"