diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/Documentation/gitcli.txt | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/Documentation/gitcli.txt')
| -rw-r--r-- | third_party/git/Documentation/gitcli.txt | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/third_party/git/Documentation/gitcli.txt b/third_party/git/Documentation/gitcli.txt index 92e4ba6a2fa9..1ed3ca33b7a9 100644 --- a/third_party/git/Documentation/gitcli.txt +++ b/third_party/git/Documentation/gitcli.txt @@ -37,12 +37,6 @@ arguments. Here are the rules: file called HEAD in your work tree, `git diff HEAD` is ambiguous, and you have to say either `git diff HEAD --` or `git diff -- HEAD` to disambiguate. - - * Because `--` disambiguates revisions and paths in some commands, it - cannot be used for those commands to separate options and revisions. - You can use `--end-of-options` for this (it also works for commands - that do not distinguish between revisions in paths, in which case it - is simply an alias for `--`). + When writing a script that is expected to handle random user-input, it is a good practice to make it explicit which arguments are which by placing @@ -126,11 +120,6 @@ usage: git describe [<options>] <commit-ish>* --long always use long format --abbrev[=<n>] use <n> digits to display SHA-1s --------------------------------------------- -+ -Note that some subcommand (e.g. `git grep`) may behave differently -when there are things on the command line other than `-h`, but `git -subcmd -h` without anything else on the command line is meant to -consistently give the usage. --help-all:: Some Git commands take options that are only used for plumbing or that @@ -216,8 +205,8 @@ only affects the files in the working tree, but with entries, and with `--cached`, it modifies only the index entries. -See also https://lore.kernel.org/git/7v64clg5u9.fsf@assigned-by-dhcp.cox.net/ and -https://lore.kernel.org/git/7vy7ej9g38.fsf@gitster.siamese.dyndns.org/ for further +See also http://marc.info/?l=git&m=116563135620359 and +http://marc.info/?l=git&m=119150393620273 for further information. Some other commands that also work on files in the working tree and/or |