Fix spelling of overridden in documentation
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Shawn Bohrer committed
Sep 25, 2007 at 23:12 UTC
b06743925c3022ffbbd459431531709df13bbf38
2 files changed
+2
-2
Documentation/git-merge.txt
+1
-1
@@ -56,7 +56,7 @@ merge.verbosity::
56
message if conflicts were detected. Level 1 outputs only
57
conflicts, 2 outputs conflicts and file changes. Level 5 and
58
above outputs debugging information. The default is level 2.
59
- Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
59
+ Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
60
61
62
HOW MERGE WORKS
Documentation/gitignore.txt
+1
-1
@@ -26,7 +26,7 @@ precedence, the last matching pattern decides the outcome):
26
27
* Patterns read from a `.gitignore` file in the same directory
28
as the path, or in any parent directory, with patterns in the
29
- higher level files (up to the root) being overriden by those in
29
+ higher level files (up to the root) being overridden by those in
30
lower level files down to the directory containing the file.
31
These patterns match relative to the location of the
32
`.gitignore` file. A project normally includes such