From ef05a39fa0c0c688ce0e8efa73076ffe62f74dc4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 21 Apr 2015 11:09:19 -0700 Subject: [PATCH] RelNotes: "merge --quiet" change has been reverted Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.4.0.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt index ad3822ce3e..a0ee37de2e 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).