Merging upstream version 0.18.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 2 deletions

diff --git a/gitlint-core/gitlint/files/gitlint b/gitlint-core/gitlint/files/gitlint
index c4d2122..3d9f273 100644
--- a/gitlint-core/gitlint/files/gitlint
+++ b/gitlint-core/gitlint/files/gitlint
@@ -14,13 +14,14 @@
 # verbosity should be a value between 1 and 3, the commandline -v flags take precedence over this
 # verbosity = 2
 
-# By default gitlint will ignore merge, revert, fixup and squash commits. 
+# By default gitlint will ignore merge, revert, fixup, fixup=amend, and squash commits. 
 # ignore-merge-commits=true
 # ignore-revert-commits=true
 # ignore-fixup-commits=true
+# ignore-fixup-amend-commits=true
 # ignore-squash-commits=true
 
-# Ignore any data send to gitlint via stdin
+# Ignore any data sent to gitlint via stdin
 # ignore-stdin=true
 
 # Fetch additional meta-data from the local repository when manually passing a 
@@ -33,6 +34,11 @@
 # Disabled by default.
 # fail-without-commits=true
 
+# Whether to use Python `search` instead of `match` semantics in rules that use
+# regexes. Context: https://github.com/jorisroovers/gitlint/issues/254
+# Disabled by default, but will be enabled by default in the future.
+# regex-style-search=true
+
 # Enable debug mode (prints more output). Disabled by default.
 # debug=true