Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (155 commits)
strbuf: instate cleanup rule in case of non-memory errors
README: tutorial.txt is now called gittutorial.txt
remove trailing LF in die() messages
Be consistent in switch usage for tar
Use capitalized names where appropriate
bash: add '--merge' to 'git reset'
show <tag>: reuse pp_user_info() instead of duplicating code
gitweb: use href() when generating URLs in OPML
fast-export: print usage when no options specified
git checkout: do not allow switching to a tree-ish that is not a commit
builtin-apply: prevent non-explicit permission changes
git wrapper: Make while loop more reader-friendly
Documentation/git-tag.txt: minor typo and grammar fix
Prepare for v1.6.1.1 maintenance release
Documentation/diff-options.txt: unify options
doc/git-send-email: mention sendemail.cc config variable
diff: add option to show context between close hunks
Fix the building of gitman.info document
Fix the building of user-manual.texi and gitman.texi documents
gitweb: Fix export check in git_get_projects_list
...