Merge branch 'master' into next
commit189a13598d81bf7641aed7f4562ffa90b3be08fe
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2008 08:55:55 +0000 (21 01:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2008 08:55:55 +0000 (21 01:55 -0700)
treeb217fa5a72cb41440426fd48cfc706ea9a2a8db1
parenta614baf76b32a327eeb26d58a1aad3b58bd528e8
parent436edc6eae34b5b70371d87239d7883f41b705a2
Merge branch 'master' into next

* master:
  compat/snprintf.c: handle snprintf's that always return the # chars transmitted
  Teach "git diff -p" HTML funcname patterns
  Teach "git diff -p" Python funcname patterns
  git-svn: fix dcommit to urls with embedded usernames
  revision.h: make show_early_output an extern which is defined in revision.c
revision.h