diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-11-06 15:17:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-06 15:17:01 -0800 |
| commit | 4badef0c3503dc29059d678abba7fac0f042bc84 (patch) | |
| tree | e5284d2d90ed97ef7191b630cfad5c49ffba9f49 /Documentation/gitcli.adoc | |
| parent | e569dced68a486b38b14cdd2e3e0b34d21752a18 (diff) | |
| parent | a2584d04344b93610ee9e958d477d743380fc8d7 (diff) | |
Merge branch 'dk/parseopt-optional-filename-fixes'HEADorigin/masterorigin/HEADmaster
A recently added configuration variable and command line option
syntax ":(optional)" for values that are of filename type
inconsistently behaved on an empty file (configuration took it
happily, while the command line option pretended as if it did not
exist), which has been corrected.
* dk/parseopt-optional-filename-fixes:
parseopt: remove unreachable code
parseopt: restore const qualifier to parsed filename
config: use boolean type for a simple flag
parseopt: use boolean type for a simple flag
doc: clarify command equivalence comment
parseopt: fix :(optional) at command line to only ignore missing files
Diffstat (limited to 'Documentation/gitcli.adoc')
| -rw-r--r-- | Documentation/gitcli.adoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitcli.adoc b/Documentation/gitcli.adoc index ef2a0a399d..6815d6bfb7 100644 --- a/Documentation/gitcli.adoc +++ b/Documentation/gitcli.adoc @@ -223,7 +223,7 @@ Options that take a filename allow a prefix `:(optional)`. For example: ---------------------------- git commit -F :(optional)COMMIT_EDITMSG -# if COMMIT_EDITMSG does not exist, equivalent to +# if COMMIT_EDITMSG does not exist, the above is equivalent to git commit ---------------------------- |