Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Feb 2010 18:39:55 +0000 (10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Feb 2010 18:39:55 +0000 (10:39 -0800)
commitd99e840cc514a7627a67c3050486683c97d6b97a
treeb6ee9c92c2e41ff2a5e716872f0cd71f2e1c9692
parent3d543b6648e1a45130c8dad3e89b62aad83af030
parent1958e5be90be7bba3037b8a7853f0fb64f24fc09
Merge branch 'master' into next

* master:
  git-p4: fix bug in symlink handling
  t1450: fix testcases that were wrongly expecting failure
  Documentation: Fix indentation problem in git-commit(1)