Merge branch 'maint-1.7.11' into maint
commite3f26752b5e9d38e88a09671d124b61fb0cd5dbf
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:31:06 +0000 (10 15:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:31:06 +0000 (10 15:31 -0700)
treefb5b5d9bc1c17bb827d97e4896d66a40c42de1ff
parent871e293c9acbeaacce59dcd98fab6028f552f5be
parent9a8eea9604ade731c3d0ff10136f2ae81b2a13c8
Merge branch 'maint-1.7.11' into maint

* maint-1.7.11:
  Almost 1.7.11.6
  gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO
  rebase -i: use full onto sha1 in reflog
  sh-setup: protect from exported IFS
  receive-pack: do not leak output from auto-gc to standard output
  t/t5400: demonstrate breakage caused by informational message from prune
  setup: clarify error messages for file/revisions ambiguity
  send-email: improve RFC2047 quote parsing
  fsck: detect null sha1 in tree entries
  do not write null sha1s to on-disk index
  diff: do not use null sha1 as a sentinel value
builtin.h
builtin/blame.c
builtin/cat-file.c
diff.c
git-rebase--interactive.sh
gitweb/gitweb.perl
read-cache.c
revision.c
setup.c