author | Junio C Hamano <gitster@pobox.com> | |
Sat, 18 Apr 2009 21:43:24 +0000 (14:43 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 18 Apr 2009 21:43:24 +0000 (14:43 -0700) | ||
commit | a4d1797332bca95635168032c90765a41eacdc7a | |
tree | 70a934732e18e9420044f0c11abd88447e49e03b | tree | snapshot |
parent | 0fa0514b9172186d018c884da296ac6705c3e07c | commit | diff |
parent | 62854410449ec407a363e4bb1dc980a75aa1699d | commit | diff |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
doc/git-daemon: add missing arguments to options
init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
* maint-1.6.0:
doc/git-daemon: add missing arguments to options
init: Do not segfault on big GIT_TEMPLATE_DIR environment variable
Documentation/git-daemon.txt | diff1 | | diff2 | | blob | history |