Merge branch 'cb/ignored-paths-are-precious' into pu

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index c5e183516a104e6efb7ed597fb4498d75560ab68..312293799d3731f488547b7904398b2bb16de81d 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -476,6 +476,13 @@ core.attributesfile::
        (see linkgit:gitattributes[5]). Path expansions are made the same
        way as for `core.excludesfile`.
 
+core.ignoredareprecious::
+       By default ignored (i.e. trashable) untracked files are
+       automatically removed from the working tree when they get in
+       the way of merge or switching between branches.  This option
+       declares that such files are precious instead, and prevents
+       merges and checkouts from succeeding.
+
 core.editor::
        Commands such as `commit` and `tag` that lets you edit
        messages by launching an editor uses the value of this