merge: --no-verify to bypass pre-merge-commit hook

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 5298f1bc3052f47e390eee780efe665083744309..8461c0e83e9d535b25755be1d5045cdc30145cb4 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -118,6 +118,7 @@ OPTIONS
        linkgit:git-status[1] `--short` or linkgit:git-diff[1]
        `--name-status` for more user-friendly alternatives.
 +
+--
 This option identifies the file status with the following tags (followed by
 a space) at the start of each line:
 
@@ -128,6 +129,7 @@ a space) at the start of each line:
        C::     modified/changed
        K::     to be killed
        ?::     other
+--
 
 -v::
        Similar to `-t`, but use lowercase letters for files