diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-02 12:02:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-02 12:02:16 -0700 |
| commit | 9d52f15af7de943779cf6302cef4f1a88ce447be (patch) | |
| tree | 53c0f1a56674b66491cd0e6942fca82b5a1968e9 /Documentation | |
| parent | 8a883b0260ba7f8d6e4c025ae3c32b454e80ade5 (diff) | |
| parent | 7d808125a0197e5660a57f77d14937604b16e39a (diff) | |
| download | git-9d52f15af7de943779cf6302cef4f1a88ce447be.tar.gz git-9d52f15af7de943779cf6302cef4f1a88ce447be.tar.xz | |
Merge branch 'maint'
* maint:
test-lib: Remove 3 year old no-op --no-python option
test-lib: Ignore --quiet under a TAP harness
Documentation/rev-parse: quoting is required with --parseopt
Documentation: reporting bugs
Fix git rebase --continue to work with touched files
Document ls-files -t as semi-obsolete.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-ls-files.txt | 12 | ||||
| -rw-r--r-- | Documentation/git-rev-parse.txt | 7 | ||||
| -rw-r--r-- | Documentation/git.txt | 7 |
3 files changed, 22 insertions, 4 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 3521637b5..bd919f2df 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -106,8 +106,16 @@ OPTIONS with `-s` or `-u` options does not make any sense. -t:: - Identify the file status with the following tags (followed by - a space) at the start of each line: + This feature is semi-deprecated. For scripting purpose, + linkgit:git-status[1] `--porcelain` and + linkgit:git-diff-files[1] `--name-status` are almost always + superior alternatives, and users should look at + linkgit:git-status[1] `--short` or linkgit:git-diff[1] + `--name-status` for more user-friendly alternatives. ++ +This option identifies the file status with the following tags (followed by +a space) at the start of each line: + H:: cached S:: skip-worktree M:: unmerged diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 0727f431c..be4c05336 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -184,10 +184,13 @@ scripts the same facilities C builtins have. It works as an option normalizer (e.g. splits single switches aggregate values), a bit like `getopt(1)` does. It takes on the standard input the specification of the options to parse and -understand, and echoes on the standard output a line suitable for `sh(1)` `eval` +understand, and echoes on the standard output a string suitable for `sh(1)` `eval` to replace the arguments with normalized ones. In case of error, it outputs usage on the standard error stream, and exits with code 129. +Note: Make sure you quote the result when passing it to `eval`. See +below for an example. + Input Format ~~~~~~~~~~~~ @@ -244,7 +247,7 @@ bar= some cool option --bar with an argument An option group Header C? option C with an optional argument" -eval `echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?` +eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)" ------------ SQ-QUOTE diff --git a/Documentation/git.txt b/Documentation/git.txt index 59f291d15..c28a7ecc4 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -727,6 +727,13 @@ The documentation for git suite was started by David Greaves <david@dgreaves.com>, and later enhanced greatly by the contributors on the git-list <git@vger.kernel.org>. +Reporting Bugs +-------------- + +Report bugs to the Git mailing list <git@vger.kernel.org> where the +development and maintenance is primarily done. You do not have to be +subscribed to the list to send a message there. + SEE ALSO -------- linkgit:gittutorial[7], linkgit:gittutorial-2[7], |