diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-08 11:59:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-08 11:59:51 -0700 |
| commit | d30acb71ca6f6f9eeb3e20fdc1aeeb22fa9756c3 (patch) | |
| tree | ece9f90548dbf34f41756888767e53a04525b4fe | |
| parent | 2b141241bf2de129270dfa5222cc59539d52dc36 (diff) | |
| parent | e28dcdce137b6ce53343aec3a4eccc0cd6f294b5 (diff) | |
| download | git-d30acb71ca6f6f9eeb3e20fdc1aeeb22fa9756c3.tar.gz git-d30acb71ca6f6f9eeb3e20fdc1aeeb22fa9756c3.tar.xz | |
Sync with maint
* maint:
shell doc: remove stray "+" in example
Start preparing for 1.9.3
| -rw-r--r-- | Documentation/RelNotes/1.9.3.txt | 21 | ||||
| -rw-r--r-- | Documentation/git-shell.txt | 2 |
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 000000000..17b05ca7b --- /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 c35051ba5..e4bdd2235 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 |