Merge branch 'maint-1.6.5' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 21:01:19 +0000 (13:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 21:01:19 +0000 (13:01 -0800)
* 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

No differences found