Merge tag 'v1.9.3'

Merge tag 'v1.9.3'

Git 1.9.3

* tag 'v1.9.3':
  Git 1.9.3
  shell doc: remove stray "+" in example
  Start preparing for 1.9.3
  git-p4: format-patch to diff-tree change breaks binary patches
  git-prompt.sh: don't put unsanitized branch names in $PS1
  Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
  rebase: avoid non-function use of "return" on FreeBSD
  test: fix t5560 on FreeBSD
  test: fix t7001 cp to use POSIX options
  utf8.c: partially update to version 6.3

Conflicts:
	GIT-VERSION-GEN