Junio C Hamano f0b0d78489 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

2010-01-20 13:01:19 -08:00

..

git-completion.bash

Merge branch 'maint-1.6.5' into maint

2010-01-20 13:01:19 -08:00