Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (455 commits)
help: remove extra blank line after "See 'git --help'" message
Test suite: reset TERM to its previous value after testing.
hooks-pre-commit: use \t, rather than a literal TAB in regexp
Fix generation of perl/perl.mak
fast-import.c: fix regression due to strbuf conversion
Support a --quiet option in the test-suite.
Add some fancy colors in the test library when terminal supports it.
git-send-email: add a new sendemail.to configuration variable
git-remote: fix "Use of uninitialized value in string ne"
k.org git toppage: Add link to 1.5.3 release notes.
On error, do not list all commands, but point to --help option
git-cherry-pick: improve description of -x.
Correct some sizeof(size_t) != sizeof(unsigned long) typing errors
Use PRIuMAX instead of 'unsigned long long' in show-index
Describe more 1.5.3.5 fixes in release notes
Fix diffcore-break total breakage
Fix directory scanner to correctly ignore files without d_type
Improved const correctness for strings
gitk: Fix "can't unset prevlines(...)" Tcl error
Define compat version of mkdtemp for systems lacking it
...
Conflicts:
diff.c (resolved to 'origin')