From 8b7eb7e08b282344298cb05c6d14c47971a22383 Mon Sep 17 00:00:00 2001
From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Wed, 20 Jun 2012 11:05:52 +0100
Subject: [PATCH] Updated to Git v1.7.11

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 doc/git/html                  |  2 +-
 git                           |  2 +-
 share/WinGit/ReleaseNotes.rtf | 21 +++++++++++++++++++--
 src/git-cheetah               |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/doc/git/html b/doc/git/html
index bec9cd11..010705ac 160000
--- a/doc/git/html
+++ b/doc/git/html
@@ -1 +1 @@
-Subproject commit bec9cd112237778ebeb7e86381316bf62885af66
+Subproject commit 010705ace148110d091fef2fb78d70223306d9e0
diff --git a/git b/git
index aa4aafb7..47a8d138 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit aa4aafb7dae7b7838af22136214b323914c5629d
+Subproject commit 47a8d138da2ae19d416d4d3435bf6c69d478d0c0
diff --git a/share/WinGit/ReleaseNotes.rtf b/share/WinGit/ReleaseNotes.rtf
index 57376a88..04273ee8 100644
--- a/share/WinGit/ReleaseNotes.rtf
+++ b/share/WinGit/ReleaseNotes.rtf
@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}{\f1\fnil\fcharset0 Arial;}{\f2\fnil\fcharset2 Symbol;}}
 {\colortbl ;\red0\green0\blue0;\red0\green0\blue255;}
-{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\cf1\lang1033\b\f0\fs32 Git Release Notes (Git-1.7.10-preview20120409)\b0\fs20\par
-Last update: 9 April 2012\par
+{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\cf1\lang1033\b\f0\fs32 Git Release Notes (Git-1.7.11-preview20120620)\b0\fs20\par
+Last update: 20 June 2012\par
 \par
 \b\fs24 Introduction\b0\fs20\par
 \par
@@ -21,6 +21,23 @@ See \cf0{\field{\*\fldinst{HYPERLINK "http://git-scm.com/"}}{\fldrslt{\ul\cf2 ht
 {\pntext\f2\'B7\tab}As merge tools are executed using the MSys bash, options starting with "/" need to be handled specially: MSys would interpret that as a POSIX path, so you need to double the slash (Issue 226).  Example: instead of "/base", say "//base".  Also, extra care has to be paid to pass Windows programs Windows paths, as they have no clue about MSys style POSIX paths -- You can use something like $(cmd //c echo "$POSIXPATH").\par
 {\pntext\f2\'B7\tab}Unless you define the environment variable MSYS_WATCH_FSTAB (the value must be a non-empty string), Git Bash will not see any drives that have been attached after bash was started. This is a workaround to help the speed of cmd scripts using parts of Git that are implemented as shell scripts.\line\line\pard\li144 Should you encounter other problems, please search the mailing list first (\cf0{\field{\*\fldinst{HYPERLINK "http://groups.google.com/group/msysgit"}}{\fldrslt{\ul\cf2 http://groups.google.com/group/msysgit}}}\cf1\f0\fs20 ) and ask there if you do not find anything.\par
 \pard\b\fs24\par
+Changes since Git-1.7.10-preview20120409\par
+\par
+\i\fs20 New Features\par
+\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Comes with Git 1.7.11 plus Windows specific patches.\par
+{\pntext\f2\'B7\tab}Updated curl to 7.26.0\par
+{\pntext\f2\'B7\tab}Updated zlib to 1.2.7\par
+{\pntext\f2\'B7\tab}Updated Inno Setup to 5.5.0 and avoid creating symbolic links (issue #16)\par
+{\pntext\f2\'B7\tab}Updated openssl to 0.9.8x and support reading certificate files from Unicode paths (issue #24)\par
+{\pntext\f2\'B7\tab}Version resource built into git executables.\par
+{\pntext\f2\'B7\tab}Support the Large Address Aware feature to reduce chance out-of-memory on 64 bit windows when repacking large repositories.\par
+\pard\b\i\par
+Bugfixes\par
+\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Please refer to the release notes for official Git 1.7.11.\par
+{\pntext\f2\'B7\tab}Fix backspace/delete key handling in rxvt terminals.\par
+{\pntext\f2\'B7\tab}Fixed TERM setting to avoid a warning from less.\par
+{\pntext\f2\'B7\tab}Various fixes for handling unicode paths.\par
+\pard\b\fs24\par
 Changes since Git-1.7.9-preview20120201\par
 \par
 \i\fs20 New Features\par
diff --git a/src/git-cheetah b/src/git-cheetah
index 09a4016f..9c634474 160000
--- a/src/git-cheetah
+++ b/src/git-cheetah
@@ -1 +1 @@
-Subproject commit 09a4016fb6172b9830550d62964978efaaf12ce8
+Subproject commit 9c63447449570cae5f1f28607348e924d9169bd4
-- 
2.11.4.GIT