Autogenerated PortableGit for 983553fc7c126623d99250556ae19463078ae76d
Autogenerated PortableGit for 054f2e797ebafd44a30203088cd3d58663c627ef
Autogenerated PortableGit for 2753bca976ee4c5749674bfef2ab0d520343be74
Autogenerated PortableGit for ea4aca3a78f574b5141b425cbf840567deaa2d46
Autogenerated PortableGit for 6d98349f44ba975cf6c762a720f8259a267ea445
Merge remote-tracking branch 'upstream/PortableGit'

Conflicts:
	etc/gitconfig

Update to match GitHub's msysgit fork
Looks like they've added more stuff to the gitconfig that's going to
get "accidentally" cleaned out of this fork.
Removed handful of the "Pimp my .gitconfig" changes

Original changes made at 9bccadc086a25da4157378be6aa5ea6c876452d0