summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-05-30 10:57:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-05-30 10:57:52 -0700
commitbce14aa132e0064d9a9b1c7ad98e71e22c6e0272 (patch)
treebc979e2a998e84450747c2c6f4010cf6c87adaa7
parentt5537: re-drop http tests (diff)
parentGit 1.9.4 (diff)
downloadtgif-bce14aa132e0064d9a9b1c7ad98e71e22c6e0272.tar.xz
Sync with 1.9.4
-rw-r--r--Documentation/RelNotes/1.9.4.txt16
-rw-r--r--Documentation/git.txt3
2 files changed, 18 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.9.4.txt b/Documentation/RelNotes/1.9.4.txt
new file mode 100644
index 0000000000..e1d1835436
--- /dev/null
+++ b/Documentation/RelNotes/1.9.4.txt
@@ -0,0 +1,16 @@
+Git v1.9.4 Release Notes
+========================
+
+Fixes since v1.9.3
+------------------
+
+ * Commands that take pathspecs on the command line misbehaved when
+ the pathspec is given as an absolute pathname (which is a
+ practice not particularly encouraged) that points at a symbolic
+ link in the working tree.
+
+ * An earlier fix to the shell prompt script (in contrib/) for using
+ the PROMPT_COMMAND interface did not correctly check if the extra
+ code path needs to trigger, causing the branch name not to appear
+ when 'promptvars' option is disabled in bash or PROMPT_SUBST is
+ unset in zsh.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index c15609face..b075e0bed5 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -48,9 +48,10 @@ Documentation for older releases are available here:
* release notes for
link:RelNotes/2.0.0.txt[2.0.0].
-* link:v1.9.3/git.html[documentation for release 1.9.3]
+* link:v1.9.4/git.html[documentation for release 1.9.4]
* release notes for
+ link:RelNotes/1.9.4.txt[1.9.4],
link:RelNotes/1.9.3.txt[1.9.3],
link:RelNotes/1.9.2.txt[1.9.2],
link:RelNotes/1.9.1.txt[1.9.1],