Merge branch 'maint-1.6.5' into maint

* maint-1.6.5:
  Git 1.6.5.8
  Fix mis-backport of t7002
  bash completion: factor submodules into dirty state
  reset: unbreak hard resets with GIT_WORK_TREE

Conflicts:
	Documentation/git.txt
	GIT-VERSION-GEN
	RelNotes

diff --cc Documentation/git.txt
index 352c23019f7dad59c735f88c0606cf056c84a578,46558c8a49c0bbf9b18a1670610c4fd9e53d1e01..c05efdaa647816c7e1e306fa62aed90c80202b58
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,14 -43,10 +43,15 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.6.5.7/git.html[documentation for release 1.6.5.7]
 +* link:v1.6.6/git.html[documentation for release 1.6.6]
 +
 +* release notes for
 +  link:RelNotes-1.6.6.txt[1.6.6].
 +
+ * link:v1.6.5.8/git.html[documentation for release 1.6.5.8]
  
  * release notes for
+   link:RelNotes-1.6.5.8.txt[1.6.5.8],
    link:RelNotes-1.6.5.7.txt[1.6.5.7],
    link:RelNotes-1.6.5.6.txt[1.6.5.6],
    link:RelNotes-1.6.5.5.txt[1.6.5.5],

diff --cc contrib/completion/git-completion.bash
Simple merge