summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-21 18:09:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-21 18:09:19 (GMT)
commitef05a39fa0c0c688ce0e8efa73076ffe62f74dc4 (patch)
treed3c50bf12003ccb2160f14687804dda6653c16df /Documentation
parent7c597ef345aed345576de616c51f27e6f4b342b3 (diff)
downloadgit-ef05a39fa0c0c688ce0e8efa73076ffe62f74dc4.zip
git-ef05a39fa0c0c688ce0e8efa73076ffe62f74dc4.tar.gz
git-ef05a39fa0c0c688ce0e8efa73076ffe62f74dc4.tar.bz2
RelNotes: "merge --quiet" change has been reverted
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/2.4.0.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt
index ad3822c..a0ee37d 100644
--- a/Documentation/RelNotes/2.4.0.txt
+++ b/Documentation/RelNotes/2.4.0.txt
@@ -313,10 +313,6 @@ notes for details).
(assuming the UTF-8 payload).
(merge 8d00662 jk/colors later to maint).
- * "git merge --quiet" did not squelch messages from the underlying
- merge-recursive strategy.
- (merge 2bf15a3 jk/merge-quiet later to maint).
-
* Longstanding configuration variable naming rules has been added to
the documentation.
(merge 35840a3 jc/conf-var-doc later to maint).