Merge branch 'master' into next
* master:
documentation: update cvsimport description of "-r" for recent clone
fast-export: Avoid dropping files from commits
Documentation: Remove spurious uses of "you" in git-bisect.txt.
Grammar fixes to "merge" and "patch-id" docs
Correct missing SP characters in grammar comment at top of fast-import.c
git-filter-branch: avoid collisions with variables in eval'ed commands
builtin-push.c: Fix typo: "anythig" -> "anything"
t7502-commit: Skip SIGTERM test on Windows
t7005-editor: Use $SHELL_PATH in the editor scripts
Guard a few Makefile variables against user environments