commit | 53b22a9e45161004ff3260782abc4ee2a5b3e730 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Thu Jun 26 17:14:03 2008 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Thu Jun 26 17:14:03 2008 -0700 |
tree | 0d12b068502c3cc0512ec44628c26f75c6438b16 | |
parent | 4afbcab9898ce63ad641dd0de6e9b69deda44330 [diff] | |
parent | 872354dcb3ce5f34f7ddb12d2c89d26a1ea4daf0 [diff] |
Merge branch 'maint-1.5.4' into maint-1.5.5 * maint-1.5.4: GIT 1.5.4.6 git-shell: accept "git foo" form Conflicts: GIT-VERSION-GEN RelNotes