Documentation: Add definition of "evil merge" to GIT Glossary

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index b73a99d61f57c7d532bbf8dc94bf2cb167d78058..38c72b87329720c630419768c9c68cbe718d7a15 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -52,7 +52,7 @@ OPTIONS
 -f::
        Allow adding otherwise ignored files.
 
-\i, \--interactive::
+-i, \--interactive::
        Add modified contents in the working tree interactively to
        the index.
 
@@ -62,6 +62,15 @@ OPTIONS
        for command-line options).
 
 
+Configuration
+-------------
+
+The optional configuration variable 'core.excludesfile' indicates a path to a
+file containing patterns of file names to exclude from git-add, similar to
+$GIT_DIR/info/exclude.  Patterns in the exclude file are used in addition to
+those in info/exclude.  See link:repository-layout.html[repository layout].
+
+
 EXAMPLES
 --------
 git-add Documentation/\\*.txt::