[elpa] externals/counsel e65cfaf9cf 2/2: Merge branch 'master' into externals/counsel

[Basil L. Contovounesios]

branch: externals/counsel
commit e65cfaf9cffb2469214fe53c988f594095d5cb54
Merge: c8785294e1 2051de5882
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    Merge branch 'master' into externals/counsel
---
 counsel.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/counsel.el b/counsel.el
index 920a5c9619..329968976f 100644
--- a/counsel.el
+++ b/counsel.el
@@ -1795,7 +1795,8 @@ currently checked out."
                (and (string-match "\\`[[:blank:]]+" line)
                     (list (substring line (match-end 0)))))
              (let ((default-directory (counsel-locate-git-root)))
-               (split-string (shell-command-to-string "git branch -vv --all")
+               (split-string (shell-command-to-string
+                              "git branch -vv --all --no-color")
                              "\n" t))))
 
 ;;;###autoload