author | Junio C Hamano <gitster@pobox.com> | |
Mon, 29 Dec 2008 09:18:34 +0000 (01:18 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 29 Dec 2008 09:18:34 +0000 (01:18 -0800) | ||
commit | 373654ee0f568fdeab891c621d6a1ac6b0c15d3a | |
tree | 874b0b65f053953d102e53830492002c12275ecd | tree | snapshot |
parent | 9c6c304d6a01b72d7ce20722b80ca62e01fe8356 | commit | diff |
parent | 936b7057e8401665a2d106e8de018561db6333fe | commit | diff |
Merge branch 'maint'
* maint:
Prepare for v1.6.1.1 maintenance release
Documentation/diff-options.txt: unify options
gitweb: Fix export check in git_get_projects_list
Conflicts:
RelNotes
* maint:
Prepare for v1.6.1.1 maintenance release
Documentation/diff-options.txt: unify options
gitweb: Fix export check in git_get_projects_list
Conflicts:
RelNotes