aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-04 15:02:08 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-04 15:02:08 -0700
commitfa38cfc2c6ce197960f85798aac18ee78aa83f1f (patch)
tree89f156b00f35fe5c92ac75c9ccf51f043fe65dd9 /Documentation
parent2071fb015bc673d2514142d7614b56a37b3faaf2 (diff)
parentd424a47e3400ef597a6f4f3c56ee67290f7c6052 (diff)
downloadgit-fa38cfc2c6ce197960f85798aac18ee78aa83f1f.tar.gz
git-fa38cfc2c6ce197960f85798aac18ee78aa83f1f.tar.xz
Merge branch 'maint'
* maint: Documentation: trivial grammar fix in core.worktree description gitweb: Fix parsing of negative fractional timezones in JavaScript
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6d4dfa602..750c86d4f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -320,7 +320,7 @@ core.worktree::
Set the path to the root of the working tree.
This can be overridden by the GIT_WORK_TREE environment
variable and the '--work-tree' command line option.
- The value can an absolute path or relative to the path to
+ The value can be an absolute path or relative to the path to
the .git directory, which is either specified by --git-dir
or GIT_DIR, or automatically discovered.
If --git-dir or GIT_DIR is specified but none of