diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 13:01:19 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 13:01:19 -0800 |
commit | f0b0d78489407f9b934cc0d4ae83e078553acbcd (patch) | |
tree | 46e521b9f27928a33fa4646e4adaf2107c2a25bc /t/t9151/make-svnmerge-dump | |
parent | bisect: fix singular/plural grammar nit (diff) | |
parent | Git 1.6.5.8 (diff) | |
download | tgif-f0b0d78489407f9b934cc0d4ae83e078553acbcd.tar.xz |
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
Diffstat (limited to 't/t9151/make-svnmerge-dump')
0 files changed, 0 insertions, 0 deletions