Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (213 commits)
add: introduce add.ignoreerrors synonym for add.ignore-errors
commit.c: Remove backward goto in read_craft_line()
bash: Match lightweight tags in prompt
git-commit.txt: (synopsis): move -i and -o before "--"
t7300: add a missing SYMLINKS prerequisite
imap-send: link against libcrypto for HMAC and others
git-send-email.perl: Deduplicate "to:" and "cc:" entries with names
mingw: do not set errno to 0 on success
Update draft release notes to 1.7.4
t6022: Use -eq not = to test output of wc -l
clean: remove redundant variable baselen
Documentation/git-pull: clarify configuration
Document that rev-list --graph triggers parent rewriting.
clean: avoid quoting twice
document sigchain api
Keep together options controlling the behaviour of diffcore-rename.
use persistent memory for rejected paths
verify-tag: document --verbose
branch: improve --verbose description
archive: improve --verbose description
...