Merge branch 'maint' to sync with 1.7.2.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

3 files changed, 25 insertions, 2 deletions

diff --git a/Documentation/RelNotes-1.7.2.2.txt b/Documentation/RelNotes-1.7.2.2.txt
new file mode 100644
index 0000000000..71eb6a8b0a
--- /dev/null
+++ b/Documentation/RelNotes-1.7.2.2.txt
@@ -0,0 +1,22 @@
+Git v1.7.2.2 Release Notes
+==========================
+
+Fixes since v1.7.2.1
+--------------------
+
+ * Object transfer over smart http transport deadlocked the client when
+   the remote HTTP server returned a failure, instead of erroring it out.
+
+ * git-gui honors custom textconv filters when showing diff and blame;
+
+ * git diff --relative=subdir (without the necessary trailing /) did not
+   work well;
+
+ * "git diff-files -p --submodule" was recently broken;
+
+ * "git checkout -b n ':/token'" did not work;
+
+ * "git index-pack" (hence "git fetch/clone/pull/push") enabled the object
+   replacement machinery by mistake (it never should have);
+
+And other minor fixes and documentation updates.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index c28a7ecc4d..531789321c 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.7.2.1/git.html[documentation for release 1.7.2.1]
+* link:v1.7.2.2/git.html[documentation for release 1.7.2.2]
 
 * release notes for
+  link:RelNotes-1.7.2.2.txt[1.7.2.2],
   link:RelNotes-1.7.2.1.txt[1.7.2.1],
   link:RelNotes-1.7.2.txt[1.7.2].
 
diff --git a/RelNotes b/RelNotes
index a479abbc60..028ad79e1f 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.7.2.1.txt
\ No newline at end of file
+Documentation/RelNotes-1.7.2.2.txt
\ No newline at end of file