kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Fix spelling of overridden in documentation 

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Shawn Bohrer 2007-09-25 23:12:46 -05:00 committed by Junio C Hamano
parent 4d84aff356
commit b06743925c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-merge.txt
View File

@ -56,7 +56,7 @@ merge.verbosity::
message if conflicts were detected. Level 1 outputs only message if conflicts were detected. Level 1 outputs only
conflicts, 2 outputs conflicts and file changes. Level 5 and conflicts, 2 outputs conflicts and file changes. Level 5 and
above outputs debugging information. The default is level 2. above outputs debugging information. The default is level 2.
Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable. Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.




HOW MERGE WORKS HOW MERGE WORKS

2
Documentation/gitignore.txt
View File

@ -26,7 +26,7 @@ precedence, the last matching pattern decides the outcome):


* Patterns read from a `.gitignore` file in the same directory * Patterns read from a `.gitignore` file in the same directory
as the path, or in any parent directory, with patterns in the as the path, or in any parent directory, with patterns in the
higher level files (up to the root) being overriden by those in higher level files (up to the root) being overridden by those in
lower level files down to the directory containing the file. lower level files down to the directory containing the file.
These patterns match relative to the location of the These patterns match relative to the location of the
`.gitignore` file. A project normally includes such `.gitignore` file. A project normally includes such