author | Junio C Hamano <gitster@pobox.com> | |
Fri, 28 Aug 2009 03:42:38 +0000 (20:42 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 28 Aug 2009 03:42:38 +0000 (20:42 -0700) | ||
commit | 5e64650d938d7a23b73532b4a68bc6bd08cfd041 | |
tree | 303f0b96211f347c2b47d04808ceb08ede54c493 | tree | snapshot |
parent | 9e4a90ba19033d25dca1eea495b0a8c5f06efbc6 | commit | diff |
parent | 93197898041fcaf84d8ac84df764cca7bf86b226 | commit | diff |
Merge branch 'maint-1.6.2' into maint-1.6.3
* maint-1.6.2:
Fix overridable written with an extra 'e'
Documentation: git-archive: mark --format as optional in summary
Round-down years in "years+months" relative date view
Conflicts:
Documentation/git-archive.txt
* maint-1.6.2:
Fix overridable written with an extra 'e'
Documentation: git-archive: mark --format as optional in summary
Round-down years in "years+months" relative date view
Conflicts:
Documentation/git-archive.txt
Documentation/git-archive.txt | diff1 | | diff2 | | blob | history |
gitweb/gitweb.perl | diff1 | | diff2 | | blob | history |