diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-08-27 20:42:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-27 20:42:38 -0700 |
| commit | 5e64650d938d7a23b73532b4a68bc6bd08cfd041 (patch) | |
| tree | 303f0b96211f347c2b47d04808ceb08ede54c493 /merge-recursive.c | |
| parent | Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3 (diff) | |
| parent | Fix overridable written with an extra 'e' (diff) | |
| download | tgif-5e64650d938d7a23b73532b4a68bc6bd08cfd041.tar.xz | |
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
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions