filter-branch: get rid of "set -e"

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 11b332117c7abbdf3c4239843672d394578f8f0a..d0e9a175f4c967f03462e92a0357165ddfb45473 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -567,6 +567,7 @@ merge.verbosity::
        message if conflicts were detected. Level 1 outputs only
        conflicts, 2 outputs conflicts and file changes.  Level 5 and
        above outputs debugging information.  The default is level 2.
+       Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
 
 merge.<driver>.name::
        Defines a human readable name for a custom low-level