diff options
| author |  Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2007-10-09 23:00:03 +0200 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 22:11:02 -0400 |
| commit | 06ada1529ce46e84aaef4e5608c1101c1c7ec73f (patch) | |
| tree | 7a57504018332d6857c17f474a27681f1c91b4a6 /Documentation/config.txt | |
| parent | manual: Fix or remove em dashes. (diff) | |
| download | tgif-06ada1529ce46e84aaef4e5608c1101c1c7ec73f.tar.xz | |
Fix some typos, punctuation, missing words, minor markup.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 971fd9f16f..d4a476e2ff 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -188,7 +188,7 @@ core.worktree:: Set the path to the working tree. The value will not be used in combination with repositories found automatically in a .git directory (i.e. $GIT_DIR is not set). - This can be overriden by the GIT_WORK_TREE environment + This can be overridden by the GIT_WORK_TREE environment variable and the '--work-tree' command line option. core.logAllRefUpdates:: @@ -607,7 +607,7 @@ merge.verbosity:: message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and 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. merge.<driver>.name:: Defines a human readable name for a custom low-level |