From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 May 2014 18:59:51 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.0.0-rc3~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d30acb71ca6f6f9eeb3e20fdc1aeeb22fa9756c3?hp=2b141241bf2de129270dfa5222cc59539d52dc36

Sync with maint

* maint:
shell doc: remove stray "+" in example
Start preparing for 1.9.3
---

diff --git a/Documentation/RelNotes/1.9.3.txt b/Documentation/RelNotes/1.9.3.txt
new file mode 100644
index 0000000000..17b05ca7b5
--- /dev/null
+++ b/Documentation/RelNotes/1.9.3.txt
@@ -0,0 +1,21 @@
+Git v1.9.3 Release Notes
+========================
+
+Fixes since v1.9.2
+------------------
+
+ * "git p4" dealing with changes in binary files were broken by a
+   change in 1.9 release.
+
+ * The shell prompt script (in contrib/), when using the PROMPT_COMMAND
+   interface, used an unsafe construct when showing the branch name in
+   $PS1.
+
+ * "git rebase" used a POSIX shell construct FreeBSD /bin/sh does not
+   work well with.
+
+ * Some more Unicode codepoints defined in Unicode 6.3 as having
+   zero width have been taught to our display column counting logic.
+
+ * Some tests used shell constructs that did not work well on
+   FreeBSD.
diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt
index c35051ba58..e4bdd2235c 100644
--- a/Documentation/git-shell.txt
+++ b/Documentation/git-shell.txt
@@ -66,7 +66,7 @@ EXAMPLE
 -------
 
 To disable interactive logins, displaying a greeting instead:
-+
+
 ----------------
 $ chsh -s /usr/bin/git-shell
 $ mkdir $HOME/git-shell-commands