From 15999998fbda60552742275570947431b57108ae Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Dec 2012 15:57:20 -0800
Subject: [PATCH] Git 1.8.0.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/RelNotes/1.8.0.3.txt | 14 ++++++++++++++
 Documentation/git.txt              |  3 ++-
 GIT-VERSION-GEN                    |  2 +-
 RelNotes                           |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/RelNotes/1.8.0.3.txt

diff --git a/Documentation/RelNotes/1.8.0.3.txt b/Documentation/RelNotes/1.8.0.3.txt
new file mode 100644
index 000000000..92b1e4b36
--- /dev/null
+++ b/Documentation/RelNotes/1.8.0.3.txt
@@ -0,0 +1,14 @@
+Git v1.8.0.3 Release Notes
+==========================
+
+Fixes since v1.8.0.2
+--------------------
+
+ * "git log -p -S<string>" did not apply the textconv filter while
+   looking for the <string>.
+
+ * In the documentation, some invalid example e-mail addresses were
+   formatted into mailto: links.
+
+Also contains many documentation updates backported from the 'master'
+branch that is preparing for the upcoming 1.8.1 release.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 1d797f27e..b0e8f0285 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,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.8.0.2/git.html[documentation for release 1.8.0.2]
+* link:v1.8.0.3/git.html[documentation for release 1.8.0.3]
 
 * release notes for
+  link:RelNotes/1.8.0.3.txt[1.8.0.3],
   link:RelNotes/1.8.0.2.txt[1.8.0.2],
   link:RelNotes/1.8.0.1.txt[1.8.0.1],
   link:RelNotes/1.8.0.txt[1.8.0].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 053628c93..4fae90f1f 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.0.2
+DEF_VER=v1.8.0.3
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 37b9d6fd5..afcfb703d 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.8.0.2.txt
\ No newline at end of file
+Documentation/RelNotes/1.8.0.3.txt
\ No newline at end of file