{"thread":{"id":"10026","subject":"[PATCH] Fix spelling of overridden in documentation","startedAt":"2007-09-26T04:12:46Z","lastAt":"2007-09-26T04:12:46Z","messageCount":1,"participants":["Shawn Bohrer"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"54083","messageId":"11907799662560-git-send-email-shawn.bohrer@gmail.com","threadId":"10026","inReplyTo":null,"subject":"[PATCH] Fix spelling of overridden in documentation","fromName":"Shawn Bohrer","fromEmail":"shawn.bohrer@gmail.com","sentAt":"2007-09-26T04:12:46Z","receivedAt":"2007-09-26T04:12:46Z","isPatch":true,"sender":{"key":"shawn.bohrer@gmail.com","avatar":"https://gravatar.com/avatar/6eb093ef7d276306d18366254e0c95ff6a5db58231ac7e82fe78c2800aaae1b6?d=mp&s=160"},"body":"Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>\n---\n Documentation/git-merge.txt |    2 +-\n Documentation/gitignore.txt |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 144bc16..eae49c4 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -56,7 +56,7 @@ merge.verbosity::\n \tmessage if conflicts were detected. Level 1 outputs only\n \tconflicts, 2 outputs conflicts and file changes.  Level 5 and\n \tabove outputs debugging information.  The default is level 2.\n-\tCan be overriden by 'GIT_MERGE_VERBOSITY' environment variable.\n+\tCan be overridden by 'GIT_MERGE_VERBOSITY' environment variable.\n \n \n HOW MERGE WORKS\ndiff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt\nindex 9c83095..e8b8581 100644\n--- a/Documentation/gitignore.txt\n+++ b/Documentation/gitignore.txt\n@@ -26,7 +26,7 @@ precedence, the last matching pattern decides the outcome):\n \n  * Patterns read from a `.gitignore` file in the same directory\n    as the path, or in any parent directory, with patterns in the\n-   higher level files (up to the root) being overriden by those in\n+   higher level files (up to the root) being overridden by those in\n    lower level files down to the directory containing the file.\n    These patterns match relative to the location of the\n    `.gitignore` file.  A project normally includes such\n-- \n1.5.3.GIT\n"}]}