author | Junio C Hamano <gitster@pobox.com> | |
Fri, 27 Jun 2008 01:08:51 +0000 (18:08 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 27 Jun 2008 01:08:51 +0000 (18:08 -0700) | ||
commit | 7ac749c96d143ba4f76723959892cbaddbe8ed07 | |
tree | 656a0719d05ffa31d1d197fdde17960bf92c4abe | tree | snapshot |
parent | 18374e584ca7a820457c1d83ee99867c216e7b75 | commit | diff |
parent | 006f31d77f3dd5f813557c2839b39b2aaa22b925 | commit | diff |
Merge branch 'maint-1.5.5' into maint
* maint-1.5.5:
GIT 1.5.5.5
GIT 1.5.4.6
git-shell: accept "git foo" form
Conflicts:
GIT-VERSION-GEN
RelNotes
* maint-1.5.5:
GIT 1.5.5.5
GIT 1.5.4.6
git-shell: accept "git foo" form
Conflicts:
GIT-VERSION-GEN
RelNotes