Merge branch 'bm/repository-layout-typofix'

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3ff0393507c5ab25f06195b1fdca4bd7bd59770a..01fd52dc7063802226bf4f7205a2a1aab697bc67 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -87,6 +87,11 @@ will be appended to the specified message.
        Allow the rerere mechanism to update the index with the
        result of auto-conflict resolution if possible.
 
+--overwrite-ignore::
+--no-overwrite-ignore::
+       Silently overwrite ignored files from the merge result. This
+       is the default behavior. Use `--no-overwrite-ignore` to abort.
+
 --abort::
        Abort the current conflict resolution process, and
        try to reconstruct the pre-merge state.