summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-05-07 15:50:15 -0700
committerJunio C Hamano <gitster@pobox.com>2014-05-07 15:51:17 -0700
commit1dc51c663c0a1c58c935677c614d31ddf687b3f1 (patch)
tree1fbfdcd71945363fad840f23f472ad6015442da8
parentccfa587787aa4f3f0990ae45af18b84b55e2c74e (diff)
downloadgit-1dc51c663c0a1c58c935677c614d31ddf687b3f1.tar.gz
Update draft release notes for 2.0
Describe one last minute one-liner fix for regression introduced in 1.9, and fix a grave mischaracterization on a recent remote-hg/bzr change, pointed out by Felipe. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.0.0.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt
index 35e353e213..6e628d4799 100644
--- a/Documentation/RelNotes/2.0.0.txt
+++ b/Documentation/RelNotes/2.0.0.txt
@@ -89,8 +89,8 @@ UI, Workflows & Features
"-h" (no header) and "-c" (count) options are given.
* "git push" via transport-helper interface (e.g. remote-hg) has
- been updated to allow ref deletion in a way similar to the natively
- supported transports.
+ been updated to allow forced ref updates in a way similar to the
+ natively supported transports.
* The "simple" mode is the default for "git push".
@@ -179,6 +179,10 @@ Unless otherwise noted, all the fixes since v1.9 in the maintenance
track are contained in this release (see the maintenance releases'
notes for details).
+ * "git p4" was broken in 1.9 release to deal with changes in binary
+ files.
+ (merge 749b668 cl/p4-use-diff-tree later to maint).
+
* The shell prompt script (in contrib/), when using the PROMPT_COMMAND
interface, used an unsafe construct when showing the branch name in
$PS1.