Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git: (342 commits)
  Add discussion section to git-tag documentation.
  Teach git-am to pass -p option down to git-apply
  Documentation: git-rebase -C<n>
  bash: Hide git-fast-import.
  fast-import: Add tip about importing renames.
  fast-import: Hide the pack boundary commits by default.
  git-gui: Stop deleting gitk preferences.
  Document that git-am can read standard input.
  Make gitk save and restore the user set window position.
  t4016: test quoting funny pathnames in diff output
  diff.c: More logical file name quoting for renames in diffstat.
  diff.c: Properly quote file names in diff --summary output.
  diff.c: Reuse the pprint_rename function for diff --summary output.
  Make it easier to override path to asciidoc command
  Avoid ugly linewrap in git help
  Fixed some typos in git-repack docs
  git-svn: correctly handle boolean options via git-config
  Allow aliases to expand to shell commands
  Print a sane error message if an alias expands to an invalid git command
  diff_flush_name(): take struct diff_options parameter.
  ...

Conflicts:

	contrib/emacs/git-blame.el
        (resolved to 'origin' version)