Merge tag 'v1.8.5.4' into fc/master

Merge tag 'v1.8.5.4' into fc/master

Git 1.8.5.4

* tag 'v1.8.5.4': (24 commits)
  Git 1.8.5.4
  git-svn: workaround for a bug in svn serf backend
  Documentation: "git pull" does not have the "-m" option
  Documentation: exclude irrelevant options from "git pull"
  stash: handle specifying stashes with $IFS
  Remove the line length limit for graft files
  add: don't complain when adding empty project root
  log: properly handle decorations with chained tags
  get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure
  git_connect(): use common return point
  connect.c: refactor url parsing
  git_connect(): refactor the port handling for ssh
  git fetch: support host:/~repo
  t5500: add test cases for diag-url
  git fetch-pack: add --diag-url
  git_connect: factor out discovery of the protocol and its parts
  git_connect: remove artificial limit of a remote command
  clone,fetch: catch non positive --depth option value
  commit -v: strip diffs and submodule shortlogs from the commit message
  t5601: add tests for ssh
  ...

Conflicts:
	GIT-VERSION-GEN