summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-05-08 18:59:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-08 18:59:51 (GMT)
commitd30acb71ca6f6f9eeb3e20fdc1aeeb22fa9756c3 (patch)
treeece9f90548dbf34f41756888767e53a04525b4fe /Documentation
parent2b141241bf2de129270dfa5222cc59539d52dc36 (diff)
parente28dcdce137b6ce53343aec3a4eccc0cd6f294b5 (diff)
downloadgit-d30acb71ca6f6f9eeb3e20fdc1aeeb22fa9756c3.zip
git-d30acb71ca6f6f9eeb3e20fdc1aeeb22fa9756c3.tar.gz
git-d30acb71ca6f6f9eeb3e20fdc1aeeb22fa9756c3.tar.bz2
Sync with maint
* maint: shell doc: remove stray "+" in example Start preparing for 1.9.3
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.9.3.txt21
-rw-r--r--Documentation/git-shell.txt2
2 files changed, 22 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.9.3.txt b/Documentation/RelNotes/1.9.3.txt
new file mode 100644
index 0000000..17b05ca
--- /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 c35051b..e4bdd22 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