Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (36 commits)
git-svn: sort multi-init output
git-svn: verify_ref() should actually --verify
git-svn: print out the SVN library version in --version, too
git-svn: remove non-delta fetch code paths
t9200-git-cvsexportcommit.sh: quiet down commit
test-lib: quiet down init-db output for tests
t6024-recursive-merge: quiet down this test
Allow git-merge to select the default strategy.
Honor pull.{twohead,octopus} in git-merge.
Ensure `git-pull` fails if `git-merge` fails.
Use branch names in 'git-rebase -m' conflict hunks.
Honor GIT_REFLOG_ACTION in git-rebase.
Use GIT_REFLOG_ACTION environment variable instead.
gitweb: Precompile CGI routines for mod_perl
gitweb: Add mod_perl version string to "generator" meta header
Set NO_MMAP for Cygwin by default
Use 'repack -a -d -l' instead of 'repack -a -d' in git-gc
gitweb: Re-enable rev-list --parents for parse_commit.
git-send-email: default value for "From:" field.
everyday: replace a few 'prune' and 'repack' with 'gc'
...