Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git:
Fix sample pre-commit hook
Addendum to "MaintNotes"
Make test scripts executable.
Make test scripts executable.
rebase -i: move help to end of todo file
bundle create: keep symbolic refs' names instead of resolving them
git-merge-ours: make it a builtin.
Refactor patch_update_cmd
Authenticate only once in git-send-email
Fix "quote" misconversion for rewrite diff output.
git-svn: allow `info' command to work offline
git-svn: info --url [path]
git-svn info: implement info command
git-svn: extract reusable code into utility functions
t9106: fix a race condition that caused svn to miss modifications