Merge branch 'master' into next

* master:
  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

diff --cc Makefile
Simple merge