Code

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)
commitf0b0d78489407f9b934cc0d4ae83e078553acbcd
tree46e521b9f27928a33fa4646e4adaf2107c2a25bc
parent6329bade6632a9df4b37dd3a7f8d641eed74bbf5
parent35eabd1579726d594e84fc8328a5c87693dd065a
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
Documentation/git.txt
contrib/completion/git-completion.bash