+2 -1

Documentation/blame-options.adoc

··· 75 75 iso format is used. For supported values, see the discussion 76 76 of the --date option at linkgit:git-log[1]. 77 77 78 78 - --[no-]progress:: 78 78 + --progress:: 79 79 + --no-progress:: 79 80 Progress status is reported on the standard error stream 80 81 by default when it is attached to a terminal. This flag 81 82 enables progress reporting even if not attached to a

+2 -1

Documentation/diff-options.adoc

··· 505 505 Turn off rename detection, even when the configuration 506 506 file gives the default to do so. 507 507 508 508 - `--[no-]rename-empty`:: 508 508 + `--rename-empty`:: 509 509 + `--no-rename-empty`:: 509 510 Whether to use empty blobs as rename source. 510 511 511 512 ifndef::git-format-patch[]

+10 -5

Documentation/fetch-options.adoc

··· 1 1 - --[no-]all:: 1 1 + --all:: 2 2 + --no-all:: 2 3 Fetch all remotes, except for the ones that has the 3 4 `remote.<name>.skipFetchAll` configuration variable set. 4 5 This overrides the configuration variable fetch.all`. ··· 88 89 precedence over the `fetch.output` config option. 89 90 90 91 ifndef::git-pull[] 91 91 - --[no-]write-fetch-head:: 92 92 + --write-fetch-head:: 93 93 + --no-write-fetch-head:: 92 94 Write the list of remote refs fetched in the `FETCH_HEAD` 93 95 file directly under `$GIT_DIR`. This is the default. 94 96 Passing `--no-write-fetch-head` from the command line tells ··· 118 120 Allow several <repository> and <group> arguments to be 119 121 specified. No <refspec>s may be specified. 120 122 121 121 - --[no-]auto-maintenance:: 122 122 - --[no-]auto-gc:: 123 123 + --auto-maintenance:: 124 124 + --no-auto-maintenance:: 125 125 + --auto-gc:: 126 126 + --no-auto-gc:: 123 127 Run `git maintenance run --auto` at the end to perform automatic 124 128 repository maintenance if needed. (`--[no-]auto-gc` is a synonym.) 125 129 This is enabled by default. 126 130 127 127 - --[no-]write-commit-graph:: 131 131 + --write-commit-graph:: 132 132 + --no-write-commit-graph:: 128 133 Write a commit-graph after fetching. This overrides the config 129 134 setting `fetch.writeCommitGraph`. 130 135 endif::git-pull[]

+2 -1

Documentation/git-am.adoc

··· 48 48 --keep-non-patch:: 49 49 Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). 50 50 51 51 - --[no-]keep-cr:: 51 51 + --keep-cr:: 52 52 + --no-keep-cr:: 52 53 With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) 53 54 with the same option, to prevent it from stripping CR at the end of 54 55 lines. `am.keepcr` configuration variable can be used to specify the

+2 -1

Documentation/git-backfill.adoc

··· 57 57 blobs seen at a given path. The default minimum batch size is 58 58 50,000. 59 59 60 60 - `--[no-]sparse`:: 60 60 + `--sparse`:: 61 61 + `--no-sparse`:: 61 62 Only download objects if they appear at a path that matches the 62 63 current sparse-checkout. If the sparse-checkout feature is enabled, 63 64 then `--sparse` is assumed and can be disabled with `--no-sparse`.

+4 -2

Documentation/git-cat-file.adoc

··· 62 62 or to ask for a "blob" with `<object>` being a tag object that 63 63 points at it. 64 64 65 65 - --[no-]mailmap:: 66 66 - --[no-]use-mailmap:: 65 65 + --mailmap:: 66 66 + --no-mailmap:: 67 67 + --use-mailmap:: 68 68 + --no-use-mailmap:: 67 69 Use mailmap file to map author, committer and tagger names 68 70 and email addresses to canonical real names and email addresses. 69 71 See linkgit:git-shortlog[1].

+2 -1

Documentation/git-check-ref-format.adoc

··· 98 98 99 99 OPTIONS 100 100 ------- 101 101 - --[no-]allow-onelevel:: 101 101 + --allow-onelevel:: 102 102 + --no-allow-onelevel:: 102 103 Controls whether one-level refnames are accepted (i.e., 103 104 refnames that do not contain multiple `/`-separated 104 105 components). The default is `--no-allow-onelevel`.

+8 -4

Documentation/git-clone.adoc

··· 272 272 reachable from a specified remote branch or tag. This option 273 273 can be specified multiple times. 274 274 275 275 - `--[no-]single-branch`:: 275 275 + `--single-branch`:: 276 276 + `--no-single-branch`:: 276 277 Clone only the history leading to the tip of a single branch, 277 278 either specified by the `--branch` option or the primary 278 279 branch remote's `HEAD` points at. ··· 282 283 branch when `--single-branch` clone was made, no remote-tracking 283 284 branch is created. 284 285 285 285 - `--[no-]tags`:: 286 286 + `--tags`:: 287 287 + `--no-tags`:: 286 288 Control whether or not tags will be cloned. When `--no-tags` is 287 289 given, the option will be become permanent by setting the 288 290 `remote.<remote>.tagOpt=--no-tags` configuration. This ensures that ··· 313 315 not have a worktree/checkout (i.e. if any of `--no-checkout`/`-n`, `--bare`, 314 316 or `--mirror` is given) 315 317 316 316 - `--[no-]shallow-submodules`:: 318 318 + `--shallow-submodules`:: 319 319 + `--no-shallow-submodules`:: 317 320 All submodules which are cloned will be shallow with a depth of 1. 318 321 319 319 - `--[no-]remote-submodules`:: 322 322 + `--remote-submodules`:: 323 323 + `--no-remote-submodules`:: 320 324 All submodules which are cloned will use the status of the submodule's 321 325 remote-tracking branch to update the submodule, rather than the 322 326 superproject's recorded SHA-1. Equivalent to passing `--remote` to

+2 -1

Documentation/git-commit-graph.adoc

··· 34 34 object directory, `git commit-graph ...` will exit with non-zero 35 35 status. 36 36 37 37 - --[no-]progress:: 37 37 + --progress:: 38 38 + --no-progress:: 38 39 Turn progress on/off explicitly. If neither is specified, progress is 39 40 shown if standard error is connected to a terminal. 40 41

+2 -1

Documentation/git-commit.adoc

··· 214 214 each trailer would appear, and other details. 215 215 216 216 `-n`:: 217 217 - `--[no-]verify`:: 217 217 + `--verify`:: 218 218 + `--no-verify`:: 218 219 Bypass the `pre-commit` and `commit-msg` hooks. 219 220 See also linkgit:githooks[5]. 220 221

+2 -1

Documentation/git-config.adoc

··· 295 295 When the color setting for `name` is undefined, the command uses 296 296 `color.ui` as fallback. 297 297 298 298 - --[no-]includes:: 298 298 + --includes:: 299 299 + --no-includes:: 299 300 Respect `include.*` directives in config files when looking up 300 301 values. Defaults to `off` when a specific file is given (e.g., 301 302 using `--file`, `--global`, etc) and `on` when searching all

+6 -3

Documentation/git-difftool.adoc

··· 77 77 --tool-help:: 78 78 Print a list of diff tools that may be used with `--tool`. 79 79 80 80 - --[no-]symlinks:: 80 80 + --symlinks:: 81 81 + --no-symlinks:: 81 82 'git difftool''s default behavior is to create symlinks to the 82 83 working tree when run in `--dir-diff` mode and the right-hand 83 84 side of the comparison yields the same content as the file in ··· 94 95 Additionally, `$BASE` is set in the environment. 95 96 96 97 -g:: 97 97 - --[no-]gui:: 98 98 + --gui:: 99 99 + --no-gui:: 98 100 When 'git-difftool' is invoked with the `-g` or `--gui` option 99 101 the default diff tool will be read from the configured 100 102 `diff.guitool` variable instead of `diff.tool`. This may be ··· 104 106 fallback in the order of `merge.guitool`, `diff.tool`, 105 107 `merge.tool` until a tool is found. 106 108 107 107 - --[no-]trust-exit-code:: 109 109 + --trust-exit-code:: 110 110 + --no-trust-exit-code:: 108 111 Errors reported by the diff tool are ignored by default. 109 112 Use `--trust-exit-code` to make 'git-difftool' exit when an 110 113 invoked diff tool returns a non-zero exit code.

+2 -1

Documentation/git-fast-import.adoc

··· 111 111 Like --import-marks but instead of erroring out, silently 112 112 skips the file if it does not exist. 113 113 114 114 - --[no-]relative-marks:: 114 114 + --relative-marks:: 115 115 + --no-relative-marks:: 115 116 After specifying --relative-marks the paths specified 116 117 with --import-marks= and --export-marks= are relative 117 118 to an internal directory in the current repository.

+2 -1

Documentation/git-fmt-merge-msg.adoc

··· 35 35 Do not list one-line descriptions from the actual commits being 36 36 merged. 37 37 38 38 - --[no-]summary:: 38 38 + --summary:: 39 39 + --no-summary:: 39 40 Synonyms to --log and --no-log; these are deprecated and will be 40 41 removed in the future. 41 42

+8 -4

Documentation/git-format-patch.adoc

··· 295 295 transformation for you, and this option should not be used if you are 296 296 feeding the result to `git send-email`. 297 297 298 298 - --[no-]force-in-body-from:: 298 298 + --force-in-body-from:: 299 299 + --no-force-in-body-from:: 299 300 With the e-mail sender specified via the `--from` option, by 300 301 default, an in-body "From:" to identify the real author of 301 302 the commit is added at the top of the commit log message if ··· 314 315 `Cc:`, and custom) headers added so far from config or command 315 316 line. 316 317 317 317 - --[no-]cover-letter:: 318 318 + --cover-letter:: 319 319 + --no-cover-letter:: 318 320 In addition to the patches, generate a cover letter file 319 321 containing the branch description, shortlog and the overall diffstat. You can 320 322 fill in a description in the file before sending it out. ··· 379 381 The default is `--no-notes`, unless the `format.notes` configuration is 380 382 set. 381 383 382 382 - --[no-]signature=<signature>:: 384 384 + --signature=<signature>:: 385 385 + --no-signature:: 383 386 Add a signature to each message produced. Per RFC 3676 the signature 384 387 is separated from the body by a line with '-- ' on it. If the 385 388 signature option is omitted the signature defaults to the Git version ··· 411 414 Output an all-zero hash in each patch's From header instead 412 415 of the hash of the commit. 413 416 414 414 - --[no-]base[=<commit>]:: 417 417 + --no-base:: 418 418 + --base[=<commit>]:: 415 419 Record the base tree information to identify the state the 416 420 patch series applies to. See the BASE TREE INFORMATION section 417 421 below for details. If <commit> is "auto", a base commit is

+6 -3

Documentation/git-fsck.adoc

··· 31 31 Print out objects that exist but that aren't reachable from any 32 32 of the reference nodes. 33 33 34 34 - --[no-]dangling:: 34 34 + --dangling:: 35 35 + --no-dangling:: 35 36 Print objects that exist but that are never 'directly' used (default). 36 37 `--no-dangling` can be used to omit this information from the output. 37 38 ··· 97 98 compatible with linkgit:git-rev-parse[1], e.g. 98 99 `HEAD@{1234567890}~25^2:src/`. 99 100 100 100 - --[no-]progress:: 101 101 + --progress:: 102 102 + --no-progress:: 101 103 Progress status is reported on the standard error stream by 102 104 default when it is attached to a terminal, unless 103 105 --no-progress or --verbose is specified. --progress forces 104 106 progress status even if the standard error stream is not 105 107 directed to a terminal. 106 108 107 107 - --[no-]references:: 109 109 + --references:: 110 110 + --no-references:: 108 111 Control whether to check the references database consistency 109 112 via 'git refs verify'. See linkgit:git-refs[1] for details. 110 113 The default is to check the references database.

+4 -2

Documentation/git-gc.adoc

··· 53 53 other housekeeping tasks (e.g. rerere, working trees, reflog...) will 54 54 be performed as well. 55 55 56 56 - --[no-]detach:: 56 56 + --detach:: 57 57 + --no-detach:: 57 58 Run in the background if the system supports it. This option overrides 58 59 the `gc.autoDetach` config. 59 60 60 60 - --[no-]cruft:: 61 61 + --cruft:: 62 62 + --no-cruft:: 61 63 When expiring unreachable objects, pack them separately into a 62 64 cruft pack instead of storing them as loose objects. `--cruft` 63 65 is on by default.

+2 -1

Documentation/git-index-pack.adoc

··· 36 36 fails if the name of packed archive does not end 37 37 with .pack). 38 38 39 39 - --[no-]rev-index:: 39 39 + --rev-index:: 40 40 + --no-rev-index:: 40 41 When this flag is provided, generate a reverse index 41 42 (a `.rev` file) corresponding to the given pack. If 42 43 `--verify` is given, ensure that the existing

+4 -2

Documentation/git-log.adoc

··· 73 73 Print out the ref name given on the command line by which each 74 74 commit was reached. 75 75 76 76 - `--[no-]mailmap`:: 77 77 - `--[no-]use-mailmap`:: 76 76 + `--mailmap`:: 77 77 + `--no-mailmap`:: 78 78 + `--use-mailmap`:: 79 79 + `--no-use-mailmap`:: 78 80 Use mailmap file to map author and committer names and email 79 81 addresses to canonical real names and email addresses. See 80 82 linkgit:git-shortlog[1].

+2 -1

Documentation/git-merge-tree.adoc

··· 59 59 do not list filenames multiple times if they have multiple 60 60 conflicting stages). 61 61 62 62 - --[no-]messages:: 62 62 + --messages:: 63 63 + --no-messages:: 63 64 Write any informational messages such as "Auto-merging <path>" 64 65 or CONFLICT notices to the end of stdout. If unspecified, the 65 66 default is to include these messages if there are merge

+2 -1

Documentation/git-multi-pack-index.adoc

··· 25 25 + 26 26 `<dir>` must be an alternate of the current repository. 27 27 28 28 - --[no-]progress:: 28 28 + --progress:: 29 29 + --no-progress:: 29 30 Turn progress on/off explicitly. If neither is specified, progress is 30 31 shown if standard error is connected to a terminal. Supported by 31 32 sub-commands `write`, `verify`, `expire`, and `repack.

+2 -1

Documentation/git-pack-objects.adoc

··· 243 243 Add --no-reuse-object if you want to force a uniform compression 244 244 level on all data no matter the source. 245 245 246 246 - --[no-]sparse:: 246 246 + --sparse:: 247 247 + --no-sparse:: 247 248 Toggle the "sparse" algorithm to determine which objects to include in 248 249 the pack, when combined with the "--revs" option. This algorithm 249 250 only walks trees that appear in paths that introduce new objects.

+2 -1

Documentation/git-pull.adoc

··· 87 87 --verbose:: 88 88 Pass --verbose to git-fetch and git-merge. 89 89 90 90 - --[no-]recurse-submodules[=(yes|on-demand|no)]:: 90 90 + --recurse-submodules[=(yes|on-demand|no)]:: 91 91 + --no-recurse-submodules:: 91 92 This option controls if new commits of populated submodules should 92 93 be fetched, and if the working trees of active submodules should be 93 94 updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and

+12 -6

Documentation/git-push.adoc

··· 197 197 with configuration variable `push.followTags`. For more 198 198 information, see `push.followTags` in linkgit:git-config[1]. 199 199 200 200 - --[no-]signed:: 200 200 + --signed:: 201 201 + --no-signed:: 201 202 --signed=(true|false|if-asked):: 202 203 GPG-sign the push request to update refs on the receiving 203 204 side, to allow it to be checked by the hooks and/or be ··· 208 209 will also fail if the actual call to `gpg --sign` fails. See 209 210 linkgit:git-receive-pack[1] for the details on the receiving end. 210 211 211 211 - --[no-]atomic:: 212 212 + --atomic:: 213 213 + --no-atomic:: 212 214 Use an atomic transaction on the remote side if available. 213 215 Either all refs are updated, or on error, no refs are updated. 214 216 If the server does not support atomic pushes the push will fail. ··· 232 234 repository over ssh, and you do not have the program in 233 235 a directory on the default $PATH. 234 236 235 235 - --[no-]force-with-lease:: 237 237 + --force-with-lease:: 238 238 + --no-force-with-lease:: 236 239 --force-with-lease=<refname>:: 237 240 --force-with-lease=<refname>:<expect>:: 238 241 Usually, "git push" refuses to update a remote ref that is ··· 350 353 origin +master` to force a push to the `master` branch). See the 351 354 `<refspec>...` section above for details. 352 355 353 353 - --[no-]force-if-includes:: 356 356 + --force-if-includes:: 357 357 + --no-force-if-includes:: 354 358 Force an update only if the tip of the remote-tracking ref 355 359 has been integrated locally. 356 360 + ··· 377 381 linkgit:git-pull[1] and other commands. For more information, 378 382 see `branch.<name>.merge` in linkgit:git-config[1]. 379 383 380 380 - --[no-]thin:: 384 384 + --thin:: 385 385 + --no-thin:: 381 386 These options are passed to linkgit:git-send-pack[1]. A thin transfer 382 387 significantly reduces the amount of sent data when the sender and 383 388 receiver share many of the same objects in common. The default is ··· 419 424 "push.recurseSubmodules={on-demand,only}" or "submodule.recurse" configuration, 420 425 further recursion will occur. In this case, "only" is treated as "on-demand". 421 426 422 422 - --[no-]verify:: 427 427 + --verify:: 428 428 + --no-verify:: 423 429 Toggle the pre-push hook (see linkgit:githooks[5]). The 424 430 default is --verify, giving the hook a chance to prevent the 425 431 push. With --no-verify, the hook is bypassed completely.

+2 -1

Documentation/git-range-diff.adoc

··· 96 96 --remerge-diff:: 97 97 Convenience option, equivalent to `--diff-merges=remerge`. 98 98 99 99 - --[no-]notes[=<ref>]:: 99 99 + --notes[=<ref>]:: 100 100 + --no-notes:: 100 101 This flag is passed to the `git log` program 101 102 (see linkgit:git-log[1]) that generates the patches. 102 103

+2 -1

Documentation/git-read-tree.adoc

··· 100 100 directories the index file and index output file are 101 101 located in. 102 102 103 103 - --[no-]recurse-submodules:: 103 103 + --recurse-submodules:: 104 104 + --no-recurse-submodules:: 104 105 Using --recurse-submodules will update the content of all active 105 106 submodules according to the commit recorded in the superproject by 106 107 calling read-tree recursively, also setting the submodules' HEAD to be

+2 -1

Documentation/git-reset.adoc

··· 90 90 If a file that is different between _<commit>_ and `HEAD` has local 91 91 changes, reset is aborted. 92 92 93 93 - `--[no-]recurse-submodules`:: 93 93 + `--recurse-submodules`:: 94 94 + `--no-recurse-submodules`:: 94 95 When the working tree is updated, using `--recurse-submodules` will 95 96 also recursively reset the working tree of all active submodules 96 97 according to the commit recorded in the superproject, also setting

+20 -10

Documentation/git-send-email.adoc

··· 115 115 Only necessary if `--compose` is also set. If `--compose` 116 116 is not set, this will be prompted for. 117 117 118 118 - --[no-]outlook-id-fix:: 118 118 + --outlook-id-fix:: 119 119 + --no-outlook-id-fix:: 119 120 Microsoft Outlook SMTP servers discard the Message-ID sent via email and 120 121 assign a new random Message-ID, thus breaking threads. 121 122 + ··· 350 351 --no-header-cmd:: 351 352 Disable any header command in use. 352 353 353 353 - --[no-]chain-reply-to:: 354 354 + --chain-reply-to:: 355 355 + --no-chain-reply-to:: 354 356 If this is set, each email will be sent as a reply to the previous 355 357 email sent. If disabled with `--no-chain-reply-to`, all emails after 356 358 the first will be sent as replies to the first email sent. When using ··· 364 366 values in the `sendemail` section. The default identity is 365 367 the value of `sendemail.identity`. 366 368 367 367 - --[no-]signed-off-by-cc:: 369 369 + --signed-off-by-cc:: 370 370 + --no-signed-off-by-cc:: 368 371 If this is set, add emails found in the `Signed-off-by` trailer or `Cc:` 369 372 lines to the cc list. Default is the value of `sendemail.signedOffByCc` 370 373 configuration value; if that is unspecified, default to 371 374 `--signed-off-by-cc`. 372 375 373 373 - --[no-]cc-cover:: 376 376 + --cc-cover:: 377 377 + --no-cc-cover:: 374 378 If this is set, emails found in `Cc:` headers in the first patch of 375 379 the series (typically the cover letter) are added to the cc list 376 380 for each email set. Default is the value of `sendemail.ccCover` 377 381 configuration value; if that is unspecified, default to `--no-cc-cover`. 378 382 379 379 - --[no-]to-cover:: 383 383 + --to-cover:: 384 384 + --no-to-cover:: 380 385 If this is set, emails found in `To:` headers in the first patch of 381 386 the series (typically the cover letter) are added to the to list 382 387 for each email set. Default is the value of `sendemail.toCover` ··· 407 412 that is unspecified, default to `self` if `--suppress-from` is 408 413 specified, as well as `body` if `--no-signed-off-cc` is specified. 409 414 410 410 - --[no-]suppress-from:: 415 415 + --suppress-from:: 416 416 + --no-suppress-from:: 411 417 If this is set, do not add the `From:` address to the `Cc:` list. 412 418 Default is the value of `sendemail.suppressFrom` configuration 413 419 value; if that is unspecified, default to `--no-suppress-from`. 414 420 415 415 - --[no-]thread:: 421 421 + --thread:: 422 422 + --no-thread:: 416 423 If this is set, the `In-Reply-To` and `References` headers will be 417 424 added to each email sent. Whether each mail refers to the 418 425 previous email (`deep` threading per `git format-patch` ··· 430 437 Failure to do so may not produce the expected result in the 431 438 recipient's MUA. 432 439 433 433 - --[no-]mailmap:: 440 440 + --mailmap:: 441 441 + --no-mailmap:: 434 442 Use the mailmap file (see linkgit:gitmailmap[5]) to map all 435 443 addresses to their canonical real name and email address. Additional 436 444 mailmap data specific to `git send-email` may be provided using the ··· 459 467 --dry-run:: 460 468 Do everything except actually send the emails. 461 469 462 462 - --[no-]format-patch:: 470 470 + --format-patch:: 471 471 + --no-format-patch:: 463 472 When an argument may be understood either as a reference or as a file name, 464 473 choose to understand it as a format-patch argument (`--format-patch`) 465 474 or as a file name (`--no-format-patch`). By default, when such a conflict ··· 469 478 Make `git send-email` less verbose. One line per email should be 470 479 all that is output. 471 480 472 472 - --[no-]validate:: 481 481 + --validate:: 482 482 + --no-validate:: 473 483 Perform sanity checks on patches. 474 484 Currently, validation means the following: 475 485 +

+2 -1

Documentation/git-send-pack.adoc

··· 71 71 fails to update then the entire push will fail without changing any 72 72 refs. 73 73 74 74 - --[no-]signed:: 74 74 + --signed:: 75 75 + --no-signed:: 75 76 --signed=(true|false|if-asked):: 76 77 GPG-sign the push request to update refs on the receiving 77 78 side, to allow it to be checked by the hooks and/or be

+4 -2

Documentation/git-submodule.adoc

··· 435 435 clone with a history truncated to the specified number of revisions. 436 436 See linkgit:git-clone[1] 437 437 438 438 - --[no-]recommend-shallow:: 438 438 + --recommend-shallow:: 439 439 + --no-recommend-shallow:: 439 440 This option is only valid for the update command. 440 441 The initial clone of a submodule will use the recommended 441 442 `submodule.<name>.shallow` as provided by the `.gitmodules` file ··· 447 448 Clone new submodules in parallel with as many jobs. 448 449 Defaults to the `submodule.fetchJobs` option. 449 450 450 450 - --[no-]single-branch:: 451 451 + --single-branch:: 452 452 + --no-single-branch:: 451 453 This option is only valid for the update command. 452 454 Clone only one branch during update: HEAD or one specified by --branch. 453 455

+8 -4

Documentation/git-update-index.adoc

··· 86 86 --chmod=(+|-)x:: 87 87 Set the execute permissions on the updated files. 88 88 89 89 - --[no-]assume-unchanged:: 89 89 + --assume-unchanged:: 90 90 + --no-assume-unchanged:: 90 91 When this flag is specified, the object names recorded 91 92 for the paths are not updated. Instead, this option 92 93 sets/unsets the "assume unchanged" bit for the ··· 108 109 Like `--refresh`, but checks stat information unconditionally, 109 110 without regard to the "assume unchanged" setting. 110 111 111 111 - --[no-]skip-worktree:: 112 112 + --skip-worktree:: 113 113 + --no-skip-worktree:: 112 114 When one of these flags is specified, the object names recorded 113 115 for the paths are not updated. Instead, these options 114 116 set and unset the "skip-worktree" bit for the paths. See 115 117 section "Skip-worktree bit" below for more information. 116 118 117 119 118 118 - --[no-]ignore-skip-worktree-entries:: 120 120 + --ignore-skip-worktree-entries:: 121 121 + --no-ignore-skip-worktree-entries:: 119 122 Do not remove skip-worktree (AKA "index-only") entries even when 120 123 the `--remove` option was specified. 121 124 122 122 - --[no-]fsmonitor-valid:: 125 125 + --fsmonitor-valid:: 126 126 + --no-fsmonitor-valid:: 123 127 When one of these flags is specified, the object names recorded 124 128 for the paths are not updated. Instead, these options 125 129 set and unset the "fsmonitor valid" bit for the paths. See

+2 -1

Documentation/git-upload-pack.adoc

··· 25 25 OPTIONS 26 26 ------- 27 27 28 28 - --[no-]strict:: 28 28 + --strict:: 29 29 + --no-strict:: 29 30 Do not try <directory>/.git/ if <directory> is not a Git directory. 30 31 31 32 --timeout=<n>::

+8 -4

Documentation/git-worktree.adoc

··· 200 200 With `add`, detach `HEAD` in the new worktree. See "DETACHED HEAD" 201 201 in linkgit:git-checkout[1]. 202 202 203 203 - --[no-]checkout:: 203 203 + --checkout:: 204 204 + --no-checkout:: 204 205 By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can 205 206 be used to suppress checkout in order to make customizations, 206 207 such as configuring sparse-checkout. See "Sparse checkout" 207 208 in linkgit:git-read-tree[1]. 208 209 209 209 - --[no-]guess-remote:: 210 210 + --guess-remote:: 211 211 + --no-guess-remote:: 210 212 With `worktree add <path>`, without `<commit-ish>`, instead 211 213 of creating a new branch from `HEAD`, if there exists a tracking 212 214 branch in exactly one remote matching the basename of `<path>`, ··· 216 218 This can also be set up as the default behaviour by using the 217 219 `worktree.guessRemote` config option. 218 220 219 219 - --[no-]relative-paths:: 221 221 + --relative-paths:: 222 222 + --no-relative-paths:: 220 223 Link worktrees using relative paths or absolute paths (default). 221 224 Overrides the `worktree.useRelativePaths` config option, see 222 225 linkgit:git-config[1]. ··· 224 227 With `repair`, the linking files will be updated if there's an absolute/relative 225 228 mismatch, even if the links are correct. 226 229 227 227 - --[no-]track:: 230 230 + --track:: 231 231 + --no-track:: 228 232 When creating a new branch, if `<commit-ish>` is a branch, 229 233 mark it as "upstream" from the new branch. This is the 230 234 default if `<commit-ish>` is a remote-tracking branch. See

+3

Documentation/lint-documentation-style.perl

··· 18 18 19 19 report($line, "multiple parameters in a definition list item"); 20 20 } 21 21 + if ($line =~ /^`?--\[no-\][a-z0-9-]+.*(::|;;)$/) { 22 22 + report($line, "definition list item with a `--[no-]` parameter"); 23 23 + } 21 24 } 22 25 23 26

+2 -1

Documentation/merge-options.adoc

··· 135 135 Only useful when merging. 136 136 endif::git-pull[] 137 137 138 138 - `--[no-]verify`:: 138 138 + `--verify`:: 139 139 + `--no-verify`:: 139 140 By default, the pre-merge and commit-msg hooks are run. 140 141 When `--no-verify` is given, these are bypassed. 141 142 See also linkgit:githooks[5].

+12 -6

Documentation/scalar.adoc

··· 71 71 Instead of checking out the branch pointed to by the cloned 72 72 repository's HEAD, check out the `<name>` branch instead. 73 73 74 74 - --[no-]single-branch:: 74 74 + --single-branch:: 75 75 + --no-single-branch:: 75 76 Clone only the history leading to the tip of a single branch, either 76 77 specified by the `--branch` option or the primary branch remote's 77 78 `HEAD` points at. ··· 81 82 cloning. If the HEAD at the remote did not point at any branch when 82 83 `--single-branch` clone was made, no remote-tracking branch is created. 83 84 84 84 - --[no-]src:: 85 85 + --src:: 86 86 + --no-src:: 85 87 By default, `scalar clone` places the cloned repository within a 86 88 `<entlistment>/src` directory. Use `--no-src` to place the cloned 87 89 repository directly in the `<enlistment>` directory. 88 90 89 89 - --[no-]tags:: 91 91 + --tags:: 92 92 + --no-tags:: 90 93 By default, `scalar clone` will fetch the tag objects advertised by 91 94 the remote and future `git fetch` commands will do the same. Use 92 95 `--no-tags` to avoid fetching tags in `scalar clone` and to configure 93 96 the repository to avoid fetching tags in the future. To fetch tags after 94 97 cloning with `--no-tags`, run `git fetch --tags`. 95 98 96 96 - --[no-]full-clone:: 99 99 + --full-clone:: 100 100 + --no-full-clone:: 97 101 A sparse-checkout is initialized by default. This behavior can be 98 102 turned off via `--full-clone`. 99 103 100 100 - --[no-]maintenance:: 104 104 + --maintenance:: 105 105 + --no-maintenance:: 101 106 By default, `scalar clone` configures the enlistment to use Git's 102 107 background maintenance feature. Use the `--no-maintenance` to skip 103 108 this configuration. ··· 122 127 parent directory is considered to be the Scalar enlistment. If the worktree is 123 128 _not_ called `src/`, it itself will be considered to be the Scalar enlistment. 124 129 125 125 - --[no-]maintenance:: 130 130 + --maintenance:: 131 131 + --no-maintenance:: 126 132 By default, `scalar register` configures the enlistment to use Git's 127 133 background maintenance feature. Use the `--no-maintenance` to skip 128 134 this configuration. This does not disable any maintenance that may