transport-helper: mismerge fix

diff --git a/Documentation/RelNotes/1.8.5.txt b/Documentation/RelNotes/1.8.5.txt
index aa50f0543a40f051b73cb8b9753949720cfe5f91..4c2aa7077b09731c120ce398036df2ed42364298 100644 (file)
--- a/Documentation/RelNotes/1.8.5.txt
+++ b/Documentation/RelNotes/1.8.5.txt
@@ -76,6 +76,10 @@ Foreign interfaces, subsystems and ports.
 
 UI, Workflows & Features
 
+ * "git grep" and "git show" pays attention to "--textconv" option
+   when these commands are told to operate on blob objects (e.g. "git
+   grep -e pattern HEAD:Makefile").
+
  * "git replace" helper no longer allows an object to be replaced with
    another object of a different type to avoid confusion (you can
    still manually craft such replacement using "git update-ref", as an