diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-21 16:26:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-21 16:26:42 -0700 |
| commit | f7bff60de95951d2c82601350cb3771b347e83ee (patch) | |
| tree | 5c0e747a86d4990b4e5b7176cec670de620dabe8 /Documentation/git.txt | |
| parent | 75a2f301676aefb85c4f67da613cad2405e77927 (diff) | |
| parent | d0bb13663000be47d83cbe53b6c4bdc8835625cb (diff) | |
| download | git-f7bff60de95951d2c82601350cb3771b347e83ee.tar.gz git-f7bff60de95951d2c82601350cb3771b347e83ee.tar.xz | |
Merge branch 'sn/doc-opt-notation' into maint
* sn/doc-opt-notation:
Fix {update,checkout}-index usage strings
Put a space between `<' and argument in pack-objects usage string
Remove stray quotes in --pretty and --format documentation
Use parentheses and `...' where appropriate
Fix odd markup in --diff-filter documentation
Use angles for placeholders consistently
Diffstat (limited to 'Documentation/git.txt')
| -rw-r--r-- | Documentation/git.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index b46c6f6d7..416d58e20 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -9,11 +9,11 @@ git - the stupid content tracker SYNOPSIS -------- [verse] -'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path] +'git' [--version] [--exec-path[=<path>]] [--html-path] [-p|--paginate|--no-pager] [--no-replace-objects] - [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] - [-c name=value] - [--help] COMMAND [ARGS] + [--bare] [--git-dir=<path>] [--work-tree=<path>] + [-c <name>=<value>] + [--help] <command> [<args>] DESCRIPTION ----------- @@ -28,7 +28,7 @@ also want to read linkgit:gitcvs-migration[7]. See the link:user-manual.html[Git User's Manual] for a more in-depth introduction. -The COMMAND is either a name of a Git command (see below) or an alias +The '<command>' is either a name of a Git command (see below) or an alias as defined in the configuration file (see linkgit:git-config[1]). Formatted and hyperlinked version of the latest git @@ -252,7 +252,7 @@ help ...`. The <name> is expected in the same format as listed by 'git config' (subkeys separated by dots). ---exec-path:: +--exec-path[=<path>]:: Path to wherever your core git programs are installed. This can also be controlled by setting the GIT_EXEC_PATH environment variable. If no path is given, 'git' will print |