![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 21:01:19 +0000 (13:01 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 21:01:19 +0000 (13:01 -0800) | ||
| commit | f0b0d78489407f9b934cc0d4ae83e078553acbcd | |
| tree | 46e521b9f27928a33fa4646e4adaf2107c2a25bc | tree | snapshot |
| parent | 6329bade6632a9df4b37dd3a7f8d641eed74bbf5 | commit | diff |
| parent | 35eabd1579726d594e84fc8328a5c87693dd065a | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
| contrib/completion/git-completion.bash | diff1 | | diff2 | | blob | history |