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: (39 commits)
  Fix typo in pack-objects' usage
  Make sure that git_getpass() never returns NULL
  t0004 (unwritable files): simplify error handling
  rev-list-options: clarify --parents and --children
  Start 1.7.4 cycle
  MinGW: avoid collisions between "tags" and "TAGS"
  diff: trivial fix for --output file error message
  user-manual: fix anchor name Finding-comments-With-given-Content
  user-manual: be consistent in illustrations to 'git rebase'
  stash: simplify parsing fixes
  Git 1.7.3.1
  stash: fix git stash branch regression when branch creation fails
  stash drops the stash even if creating the branch fails because it already exists
  disallow branch names that start with a hyphen
  send-email: use catfile() to concatenate files
  log --author: take union of multiple "author" requests
  grep: move logic to compile header pattern into a separate helper
  t/gitweb-lib.sh: Use tabs for indent consistently
  t/gitweb-lib.sh: Use GIT_BUILD_DIR
  userdiff.c: add builtin fortran regex patterns
  ...