From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Dec 2016 08:11:42 +0000 (-0800)
Subject: Merge branch 'ls/filter-process'
X-Git-Tag: v2.12.0-rc0~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08721a056b0370e0de002162dfc5578548c0c116;p=thirdparty%2Fgit.git

Merge branch 'ls/filter-process'

Doc update.

* ls/filter-process:
  t0021: fix flaky test
  docs: warn about possible '=' in clean/smudge filter process values
---

08721a056b0370e0de002162dfc5578548c0c116
diff --cc t/t0021/rot13-filter.pl
index 4d5697ee51,02b3363fd9..617f581e56
mode 100644,100755..100644
--- a/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl