From 7f7e6a47a4543fc8b8335e64746e0f7e3ce80f4a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 4 Dec 2024 13:45:58 +0900 Subject: [PATCH] Autogenerated HTML docs for v2.47.1-397-g23692e --- DecisionMaking.html | 2 +- MyFirstContribution.html | 2 +- MyFirstObjectWalk.html | 2 +- RelNotes/2.48.0.txt | 34 +- ReviewingGuidelines.html | 2 +- SubmittingPatches.html | 2 +- ToolsForGit.html | 2 +- diff-format.txt | 42 +- diff-generate-patch.txt | 44 +- diff-options.txt | 423 +++++++-------- everyday.html | 2 +- fsck-msgids.txt | 35 ++ git-config.html | 186 +++---- git-diff-files.html | 465 ++++++++-------- git-diff-index.html | 465 ++++++++-------- git-diff-tree.html | 465 ++++++++-------- git-diff.html | 781 ++++++++++++++------------- git-diff.txt | 122 +++-- git-format-patch.html | 226 ++++---- git-fsck.html | 43 +- git-log.html | 435 ++++++++------- git-remote-helpers.html | 2 +- git-show.html | 435 ++++++++------- howto/keep-canonical-history-correct.html | 4 +- howto/maintain-git.html | 4 +- howto/new-command.html | 4 +- howto/rebase-from-internal-branch.html | 4 +- howto/rebuild-from-update-hook.html | 4 +- howto/recover-corrupted-blob-object.html | 4 +- howto/recover-corrupted-object-harder.html | 4 +- howto/revert-a-faulty-merge.html | 4 +- howto/revert-branch-rebase.html | 4 +- howto/separating-topic-branches.html | 4 +- howto/setup-git-server-over-http.html | 4 +- howto/update-hook-example.html | 4 +- howto/use-git-daemon.html | 4 +- howto/using-merge-subtree.html | 4 +- howto/using-signed-tag-in-pull-request.html | 4 +- technical/api-error-handling.html | 2 +- technical/api-index.html | 2 +- technical/api-merge.html | 2 +- technical/api-parse-options.html | 2 +- technical/api-simple-ipc.html | 2 +- technical/api-trace2.html | 2 +- technical/bitmap-format.html | 2 +- technical/bundle-uri.html | 2 +- technical/hash-function-transition.html | 2 +- technical/long-running-process-protocol.html | 2 +- technical/multi-pack-index.html | 2 +- technical/pack-heuristics.html | 2 +- technical/parallel-checkout.html | 2 +- technical/partial-clone.html | 2 +- technical/platform-support.html | 2 +- technical/racy-git.html | 2 +- technical/scalar.html | 2 +- technical/send-pack-pipeline.html | 2 +- technical/shallow.html | 2 +- technical/trivial-merge.html | 2 +- technical/unit-tests.html | 2 +- 59 files changed, 2206 insertions(+), 2113 deletions(-) diff --git a/DecisionMaking.html b/DecisionMaking.html index af8259c3..fab33f6b 100644 --- a/DecisionMaking.html +++ b/DecisionMaking.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/MyFirstContribution.html b/MyFirstContribution.html index c80857d7..9da90fc9 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index dd916984..c546d118 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/RelNotes/2.48.0.txt b/RelNotes/2.48.0.txt index a949a103..137dc100 100644 --- a/RelNotes/2.48.0.txt +++ b/RelNotes/2.48.0.txt @@ -19,12 +19,13 @@ UI, Workflows & Features * Documentation for "git bundle" saw improvements to more prominently call out the use of '--all' when creating bundles. + * Drop support for older libcURL and Perl. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- * Document "amlog" notes. - (merge ddfb5bcfc6 tb/notes-amlog-doc later to maint). * The way AsciiDoc is used for SYNOPSIS part of the manual pages has been revamped. The sources, at least for the simple cases, got @@ -94,13 +95,24 @@ Performance, Internal Implementation, Development Support etc. * We now ensure "index-pack" is used with the "--promisor" option only during a "git fetch". + * The migration procedure between two ref backends has been optimized. + + * "git fsck" learned to issue warnings on "curiously formatted" ref + contents that have always been taken valid but something Git + wouldn't have written itself (e.g., missing terminating end-of-line + after the full object name). + + * Work around Coverity warning that would not trigger in practice. + + * Built-in Git subcommands are supplied the repository object to work + with; they learned to do the same when they invoke sub-subcommands. + Fixes since v2.47 ----------------- * Doc update to clarify how periodical maintenance are scheduled, spread across time to avoid thundering hurds. - (merge 3d6ab4177d sk/doc-maintenance-schedule later to maint). * Use after free and double freeing at the end in "git log -L... -p" had been identified and fixed. @@ -179,17 +191,15 @@ Fixes since v2.47 been corrected. (merge b886db48c6 kn/ref-transaction-hook-with-reflog later to maint). + * Give a bit of advice/hint message when "git maintenance" stops finding a + lock file left by another instance that still is potentially running. + (merge ba874d1dac ps/gc-stale-lock-warning later to maint). + + * Use the right helper program to measure file size in performance tests. + (merge 3f97f1bce6 tb/use-test-file-size-more later to maint). + * Other code cleanup, docfix, build fix, etc. - (merge 1164e270b5 jk/output-prefix-cleanup later to maint). - (merge f36b8cbaef jh/config-unset-doc-fix later to maint). - (merge 4154ed4108 js/doc-platform-support-link-fix later to maint). (merge 77af53f56f aa/t7300-modernize later to maint). - (merge 8ead1bba3e jc/doc-refspec-syntax later to maint). - (merge 432f666aa6 kn/loose-object-layer-wo-global-hash later to maint). - (merge c4b8fb6ef2 kh/merge-tree-doc later to maint). - (merge b8139c8f4e kh/checkout-ignore-other-docfix later to maint). - (merge 6dab49b9fb tc/bundle-uri-leakfix later to maint). - (merge f1ed39987b xx/protocol-v2-doc-markup-fix later to maint). - (merge 41869f7447 ak/typofixes later to maint). (merge dcd590a39d bf/t-readme-mention-reftable later to maint). (merge 68e3c69efa kh/trailer-in-glossary later to maint). + (merge 91f88f76e6 tb/boundary-traversal-fix later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index 6c6c1887..13d246fd 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/SubmittingPatches.html b/SubmittingPatches.html index 855c87b9..68e881c2 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/ToolsForGit.html b/ToolsForGit.html index 79ea5709..8d054dee 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/diff-format.txt b/diff-format.txt index a3ae8747..c72fb379 100644 --- a/diff-format.txt +++ b/diff-format.txt @@ -1,25 +1,25 @@ Raw output format ----------------- -The raw output format from "git-diff-index", "git-diff-tree", -"git-diff-files" and "git diff --raw" are very similar. +The raw output format from `git-diff-index`, `git-diff-tree`, +`git-diff-files` and `git diff --raw` are very similar. These commands all compare two sets of things; what is compared differs: -git-diff-index :: - compares the and the files on the filesystem. +`git-diff-index `:: + compares the __ and the files on the filesystem. -git-diff-index --cached :: - compares the and the index. +`git-diff-index --cached `:: + compares the __ and the index. -git-diff-tree [-r] [...]:: +`git-diff-tree [-r] [...]`:: compares the trees named by the two arguments. -git-diff-files [...]:: +`git-diff-files [...]`:: compares the index and the files on the filesystem. -The "git-diff-tree" command begins its output by printing the hash of +The `git-diff-tree` command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file. @@ -54,19 +54,19 @@ That is, from the left to the right: Possible status letters are: -- A: addition of a file -- C: copy of a file into a new one -- D: deletion of a file -- M: modification of the contents or mode of a file -- R: renaming of a file -- T: change in the type of the file (regular file, symbolic link or submodule) -- U: file is unmerged (you must complete the merge before it can +- `A`: addition of a file +- `C`: copy of a file into a new one +- `D`: deletion of a file +- `M`: modification of the contents or mode of a file +- `R`: renaming of a file +- `T`: change in the type of the file (regular file, symbolic link or submodule) +- `U`: file is unmerged (you must complete the merge before it can be committed) -- X: "unknown" change type (most probably a bug, please report it) +- `X`: "unknown" change type (most probably a bug, please report it) -Status letters C and R are always followed by a score (denoting the +Status letters `C` and `R` are always followed by a score (denoting the percentage of similarity between the source and target of the move or -copy). Status letter M may be followed by a score (denoting the +copy). Status letter `M` may be followed by a score (denoting the percentage of dissimilarity) for file rewrites. The sha1 for "dst" is shown as all 0's if a file on the filesystem @@ -86,7 +86,7 @@ verbatim and the line is terminated by a NUL byte. diff format for merges ---------------------- -"git-diff-tree", "git-diff-files" and "git-diff --raw" +`git-diff-tree`, `git-diff-files` and `git-diff --raw` can take `-c` or `--cc` option to generate diff output also for merge commits. The output differs from the format described above in the following way: @@ -128,7 +128,7 @@ other diff formats ------------------ The `--summary` option describes newly added, deleted, renamed and -copied files. The `--stat` option adds diffstat(1) graph to the +copied files. The `--stat` option adds `diffstat`(1) graph to the output. These options can be combined with other options, such as `-p`, and are meant for human consumption. diff --git a/diff-generate-patch.txt b/diff-generate-patch.txt index 4b5aa5c2..e5c813c9 100644 --- a/diff-generate-patch.txt +++ b/diff-generate-patch.txt @@ -14,7 +14,7 @@ You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1]), and the `diff` attribute (see linkgit:gitattributes[5]). -What the -p option produces is slightly different from the traditional +What the `-p` option produces is slightly different from the traditional diff format: 1. It is preceded by a "git diff" header that looks like this: @@ -30,20 +30,21 @@ name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively. 2. It is followed by one or more extended header lines: - - old mode - new mode - deleted file mode - new file mode - copy from - copy to - rename from - rename to - similarity index - dissimilarity index - index .. + -File modes are printed as 6-digit octal numbers including the file type +[synopsis] +old mode +new mode +deleted file mode +new file mode +copy from +copy to +rename from +rename to +similarity index +dissimilarity index +index .. ++ +File modes __ are printed as 6-digit octal numbers including the file type and file permission bits. + Path names in extended headers do not include the `a/` and `b/` prefixes. @@ -56,7 +57,7 @@ files, while 100% dissimilarity means that no line from the old file made it into the new one. + The index line includes the blob object names before and after the change. -The is included if the file mode does not change; otherwise, +The __ is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode. 3. Pathnames with "unusual" characters are quoted as explained for @@ -134,17 +135,18 @@ or like this (when the `--cc` option is used): 2. It is followed by one or more extended header lines (this example shows a merge with two parents): - - index ,.. - mode ,.. - new file mode - deleted file mode , ++ +[synopsis] +index ,.. +mode ,`..` +new file mode +deleted file mode , + The `mode ,..` line appears only if at least one of the is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two - and are not used by combined diff format. +__ and are not used by combined diff format. 3. It is followed by a two-line from-file/to-file header: diff --git a/diff-options.txt b/diff-options.txt index cd0b81ad..640eb6e7 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -19,16 +19,16 @@ ifdef::git-format-patch[] endif::git-format-patch[] ifndef::git-format-patch[] --p:: --u:: ---patch:: +`-p`:: +`-u`:: +`--patch`:: Generate patch (see <>). ifdef::git-diff[] This is the default. endif::git-diff[] --s:: ---no-patch:: +`-s`:: +`--no-patch`:: Suppress all output from the diff machinery. Useful for commands like `git show` that show the patch by default to squelch their output, or to cancel the effect of options like @@ -39,28 +39,28 @@ endif::git-format-patch[] ifdef::git-log[] -m:: Show diffs for merge commits in the default format. This is - similar to '--diff-merges=on', except `-m` will + similar to `--diff-merges=on`, except `-m` will produce no output unless `-p` is given as well. -c:: Produce combined diff output for merge commits. - Shortcut for '--diff-merges=combined -p'. + Shortcut for `--diff-merges=combined -p`. --cc:: Produce dense combined diff output for merge commits. - Shortcut for '--diff-merges=dense-combined -p'. + Shortcut for `--diff-merges=dense-combined -p`. --dd:: Produce diff with respect to first parent for both merge and regular commits. - Shortcut for '--diff-merges=first-parent -p'. + Shortcut for `--diff-merges=first-parent -p`. --remerge-diff:: Produce remerge-diff output for merge commits. - Shortcut for '--diff-merges=remerge -p'. + Shortcut for `--diff-merges=remerge -p`. --no-diff-merges:: - Synonym for '--diff-merges=off'. + Synonym for `--diff-merges=off`. --diff-merges=:: Specify diff format to be used for merge commits. Default is @@ -73,33 +73,33 @@ The following formats are supported: off, none:: Disable output of diffs for merge commits. Useful to override implied value. -+ + on, m:: Make diff output for merge commits to be shown in the default format. The default format can be changed using `log.diffMerges` configuration variable, whose default value is `separate`. -+ + first-parent, 1:: Show full diff with respect to first parent. This is the same format as `--patch` produces for non-merge commits. -+ + separate:: Show full diff with respect to each of parents. Separate log entry and diff is generated for each parent. -+ + combined, c:: Show differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents. -+ + dense-combined, cc:: Further compress output produced by `--diff-merges=combined` by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification. -+ + remerge, r:: Remerge two-parent merge commits to create a temporary tree object--potentially containing files with conflict markers @@ -112,33 +112,33 @@ documented). -- --combined-all-paths:: - This flag causes combined diffs (used for merge commits) to + Cause combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when `--diff-merges=[dense-]combined` is in use, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested). endif::git-log[] --U:: ---unified=:: - Generate diffs with lines of context instead of +`-U`:: +`--unified=`:: + Generate diffs with __ lines of context instead of the usual three. ifndef::git-format-patch[] Implies `--patch`. endif::git-format-patch[] ---output=:: +`--output=`:: Output to a specific file instead of stdout. ---output-indicator-new=:: ---output-indicator-old=:: ---output-indicator-context=:: +`--output-indicator-new=`:: +`--output-indicator-old=`:: +`--output-indicator-context=`:: Specify the character used to indicate new, old or context - lines in the generated patch. Normally they are '+', '-' and + lines in the generated patch. Normally they are `+`, `-` and ' ' respectively. ifndef::git-format-patch[] ---raw:: +`--raw`:: ifndef::git-log[] Generate the diff in raw format. ifdef::git-diff-core[] @@ -155,54 +155,55 @@ endif::git-log[] endif::git-format-patch[] ifndef::git-format-patch[] ---patch-with-raw:: +`--patch-with-raw`:: Synonym for `-p --raw`. endif::git-format-patch[] ifdef::git-log[] --t:: +`-t`:: Show the tree objects in the diff output. endif::git-log[] ---indent-heuristic:: +`--indent-heuristic`:: Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default. ---no-indent-heuristic:: +`--no-indent-heuristic`:: Disable the indent heuristic. ---minimal:: +`--minimal`:: Spend extra time to make sure the smallest possible diff is produced. ---patience:: +`--patience`:: Generate a diff using the "patience diff" algorithm. ---histogram:: +`--histogram`:: Generate a diff using the "histogram diff" algorithm. ---anchored=:: +`--anchored=`:: Generate a diff using the "anchored diff" algorithm. + This option may be specified more than once. + If a line exists in both the source and destination, exists only once, -and starts with this text, this algorithm attempts to prevent it from +and starts with __, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the "patience diff" algorithm internally. ---diff-algorithm={patience|minimal|histogram|myers}:: +`--diff-algorithm=(patience|minimal|histogram|myers)`:: Choose a diff algorithm. The variants are as follows: + -- -`default`, `myers`;; + `default`;; + `myers`;; The basic greedy diff algorithm. Currently, this is the default. -`minimal`;; + `minimal`;; Spend extra time to make sure the smallest possible diff is produced. -`patience`;; + `patience`;; Use "patience diff" algorithm when generating patches. -`histogram`;; + `histogram`;; This algorithm extends the patience algorithm to "support low-occurrence common elements". -- @@ -211,47 +212,47 @@ For instance, if you configured the `diff.algorithm` variable to a non-default value and want to use the default one, then you have to use `--diff-algorithm=default` option. ---stat[=[,[,]]]:: +`--stat[=[,[,]]]`:: Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by - ``. The width of the filename part can be limited by - giving another width `` after a comma or by setting - `diff.statNameWidth=`. The width of the graph part can be - limited by using `--stat-graph-width=` or by setting - `diff.statGraphWidth=`. Using `--stat` or + __. The width of the filename part can be limited by + giving another width __ after a comma or by setting + `diff.statNameWidth=`. The width of the graph part can be + limited by using `--stat-graph-width=` or by setting + `diff.statGraphWidth=`. Using `--stat` or `--stat-graph-width` affects all commands generating a stat graph, while setting `diff.statNameWidth` or `diff.statGraphWidth` does not affect `git format-patch`. - By giving a third parameter ``, you can limit the output to - the first `` lines, followed by `...` if there are more. + By giving a third parameter __, you can limit the output to + the first __ lines, followed by `...` if there are more. + These parameters can also be set individually with `--stat-width=`, `--stat-name-width=` and `--stat-count=`. ---compact-summary:: +`--compact-summary`:: Output a condensed summary of extended header information such - as file creations or deletions ("new" or "gone", optionally "+l" - if it's a symlink) and mode changes ("+x" or "-x" for adding + as file creations or deletions ("new" or "gone", optionally `+l` + if it's a symlink) and mode changes (`+x` or `-x` for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies `--stat`. ---numstat:: +`--numstat`:: Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`. ---shortstat:: +`--shortstat`:: Output only the last line of the `--stat` format containing total number of modified files, as well as number of added and deleted lines. --X[]:: ---dirstat[=]:: +`-X [,...]`:: +`--dirstat[=,...]`:: Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. @@ -284,7 +285,7 @@ These parameters can also be set individually with `--stat-width=`, Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter. -;; +__;; An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output. @@ -295,29 +296,29 @@ directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`. ---cumulative:: - Synonym for --dirstat=cumulative +`--cumulative`:: + Synonym for `--dirstat=cumulative`. ---dirstat-by-file[=...]:: - Synonym for --dirstat=files,,... +`--dirstat-by-file[=,...]`:: + Synonym for `--dirstat=files,,...`. ---summary:: +`--summary`:: Output a condensed summary of extended header information such as creations, renames and mode changes. ifndef::git-format-patch[] ---patch-with-stat:: +`--patch-with-stat`:: Synonym for `-p --stat`. endif::git-format-patch[] ifndef::git-format-patch[] --z:: +`-z`:: ifdef::git-log[] - Separate the commits with NULs instead of newlines. + Separate the commits with __NUL__s instead of newlines. + Also, when `--raw` or `--numstat` has been given, do not munge -pathnames and use NULs as output field terminators. +pathnames and use __NUL__s as output field terminators. endif::git-log[] ifndef::git-log[] When `--raw`, `--numstat`, `--name-only` or `--name-status` has been @@ -328,89 +329,89 @@ Without this option, pathnames with "unusual" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). ---name-only:: +`--name-only`:: Show only the name of each changed file in the post-image tree. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the linkgit:git-log[1] manual page. ---name-status:: +`--name-status`:: Show only the name(s) and status of each changed file. See the description of the `--diff-filter` option on what the status letters mean. Just like `--name-only` the file names are often encoded in UTF-8. ---submodule[=]:: +`--submodule[=]`:: Specify how differences in submodules are shown. When specifying - `--submodule=short` the 'short' format is used. This format just + `--submodule=short` the `short` format is used. This format just shows the names of the commits at the beginning and end of the range. - When `--submodule` or `--submodule=log` is specified, the 'log' + When `--submodule` or `--submodule=log` is specified, the `log` format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` - is specified, the 'diff' format is used. This format shows an + is specified, the `diff` format is used. This format shows an inline diff of the changes in the submodule contents between the - commit range. Defaults to `diff.submodule` or the 'short' format + commit range. Defaults to `diff.submodule` or the `short` format if the config option is unset. ---color[=]:: +`--color[=]`:: Show colored diff. - `--color` (i.e. without '=') is the same as `--color=always`. - '' can be one of `always`, `never`, or `auto`. + `--color` (i.e. without `=`) is the same as `--color=always`. + __ can be one of `always`, `never`, or `auto`. ifdef::git-diff[] It can be changed by the `color.ui` and `color.diff` configuration settings. endif::git-diff[] ---no-color:: +`--no-color`:: Turn off colored diff. ifdef::git-diff[] This can be used to override configuration settings. endif::git-diff[] It is the same as `--color=never`. ---color-moved[=]:: +`--color-moved[=]`:: Moved lines of code are colored differently. ifdef::git-diff[] It can be changed by the `diff.colorMoved` configuration setting. endif::git-diff[] - The defaults to 'no' if the option is not given - and to 'zebra' if the option with no mode is given. + The __ defaults to `no` if the option is not given + and to `zebra` if the option with no mode is given. The mode must be one of: + -- -no:: +`no`:: Moved lines are not highlighted. -default:: +`default`:: Is a synonym for `zebra`. This may change to a more sensible mode in the future. -plain:: +`plain`:: Any line that is added in one location and was removed - in another location will be colored with 'color.diff.newMoved'. - Similarly 'color.diff.oldMoved' will be used for removed lines + in another location will be colored with `color.diff.newMoved`. + Similarly `color.diff.oldMoved` will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation. -blocks:: +`blocks`:: Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are - painted using either the 'color.diff.{old,new}Moved' color. + painted using either the `color.diff.(old|new)Moved` color. Adjacent blocks cannot be told apart. -zebra:: - Blocks of moved text are detected as in 'blocks' mode. The blocks - are painted using either the 'color.diff.{old,new}Moved' color or - 'color.diff.{old,new}MovedAlternative'. The change between +`zebra`:: + Blocks of moved text are detected as in `blocks` mode. The blocks + are painted using either the `color.diff.(old|new)Moved` color or + `color.diff.(old|new)MovedAlternative`. The change between the two colors indicates that a new block was detected. -dimmed-zebra:: - Similar to 'zebra', but additional dimming of uninteresting parts +`dimmed-zebra`:: + Similar to `zebra`, but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym. -- ---no-color-moved:: +`--no-color-moved`:: Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`. ---color-moved-ws=:: +`--color-moved-ws=,...`:: This configures how whitespace is ignored when performing the move detection for `--color-moved`. ifdef::git-diff[] @@ -419,63 +420,62 @@ endif::git-diff[] These modes can be given as a comma separated list: + -- -no:: +`no`:: Do not ignore whitespace when performing move detection. -ignore-space-at-eol:: +`ignore-space-at-eol`:: Ignore changes in whitespace at EOL. -ignore-space-change:: +`ignore-space-change`:: Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent. -ignore-all-space:: +`ignore-all-space`:: Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none. -allow-indentation-change:: +`allow-indentation-change`:: Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes. -- ---no-color-moved-ws:: +`--no-color-moved-ws`:: Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as `--color-moved-ws=no`. ---word-diff[=]:: - Show a word diff, using the to delimit changed words. +`--word-diff[=]`:: By default, words are delimited by whitespace; see - `--word-diff-regex` below. The defaults to 'plain', and + `--word-diff-regex` below. The __ defaults to `plain`, and must be one of: + -- -color:: +`color`:: Highlight changed words using only colors. Implies `--color`. -plain:: - Show words as `[-removed-]` and `{+added+}`. Makes no +`plain`:: + Show words as ++[-removed-]++ and ++{+added+}++. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous. -porcelain:: +`porcelain`:: Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own. -none:: +`none`:: Disable word diff again. -- + Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled. ---word-diff-regex=:: - Use to decide what a word is, instead of considering +`--word-diff-regex=`:: + Use __ to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled. + Every non-overlapping match of the - is considered a word. Anything between these matches is +__ is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. @@ -490,20 +490,20 @@ linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings. ---color-words[=]:: +`--color-words[=]`:: Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=`. endif::git-format-patch[] ---no-renames:: +`--no-renames`:: Turn off rename detection, even when the configuration file gives the default to do so. ---[no-]rename-empty:: +`--[no-]rename-empty`:: Whether to use empty blobs as rename source. ifndef::git-format-patch[] ---check:: +`--check`:: Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including @@ -511,9 +511,9 @@ ifndef::git-format-patch[] that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible - with --exit-code. + with `--exit-code`. ---ws-error-highlight=:: +`--ws-error-highlight=`:: Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to @@ -525,30 +525,30 @@ ifndef::git-format-patch[] endif::git-format-patch[] ---full-index:: +`--full-index`:: Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output. ---binary:: +`--binary`:: In addition to `--full-index`, output a binary diff that can be applied with `git-apply`. ifndef::git-format-patch[] Implies `--patch`. endif::git-format-patch[] ---abbrev[=]:: +`--abbrev[=]`:: Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header - lines, show the shortest prefix that is at least '' + lines, show the shortest prefix that is at least __ hexdigits long that uniquely refers the object. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. Non default number of digits can be specified with `--abbrev=`. --B[][/]:: ---break-rewrites[=[][/]]:: +`-B[][/]`:: +`--break-rewrites[=[][/]]`:: Break complete rewrite changes into pairs of delete and create. This serves two purposes: + @@ -556,22 +556,22 @@ It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of -everything new, and the number `m` controls this aspect of the -B +everything new, and the number __ controls this aspect of the `-B` option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines). + -When used with -M, a totally-rewritten file is also considered as the -source of a rename (usually -M only considers a file that disappeared -as the source of a rename), and the number `n` controls this aspect of -the -B option (defaults to 50%). `-B20%` specifies that a change with +When used with `-M`, a totally-rewritten file is also considered as the +source of a rename (usually `-M` only considers a file that disappeared +as the source of a rename), and the number __ controls this aspect of +the `-B` option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file. --M[]:: ---find-renames[=]:: +`-M[]`:: +`--find-renames[=]`:: ifndef::git-log[] Detect renames. endif::git-log[] @@ -580,7 +580,7 @@ ifdef::git-log[] For following files across renames while traversing history, see `--follow`. endif::git-log[] - If `n` is specified, it is a threshold on the similarity + If __ is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file's size). For example, `-M90%` means Git should consider a delete/add pair to be a rename if more than 90% of the file @@ -590,12 +590,12 @@ endif::git-log[] the same as `-M5%`. To limit detection to exact renames, use `-M100%`. The default similarity index is 50%. --C[]:: ---find-copies[=]:: +`-C[]`:: +`--find-copies[=]`:: Detect copies as well as renames. See also `--find-copies-harder`. - If `n` is specified, it has the same meaning as for `-M`. + If __ is specified, it has the same meaning as for `-M`. ---find-copies-harder:: +`--find-copies-harder`:: For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command @@ -604,8 +604,8 @@ endif::git-log[] projects, so use it with caution. Giving more than one `-C` option has the same effect. --D:: ---irreversible-delete:: +`-D`:: +`--irreversible-delete`:: Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is @@ -617,7 +617,7 @@ endif::git-log[] When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair. --l:: +`-l`:: The `-M` and `-C` options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an exhaustive fallback portion that compares all remaining @@ -627,11 +627,11 @@ of a delete/create pair. destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved - exceeds the specified number. Defaults to diff.renameLimit. + exceeds the specified number. Defaults to `diff.renameLimit`. Note that a value of 0 is treated as unlimited. ifndef::git-format-patch[] ---diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]:: +`--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]`:: Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), @@ -649,9 +649,9 @@ Also, these upper-case letters can be downcased to exclude. E.g. Note that not all diffs can feature all types. For instance, copied and renamed entries cannot appear if detection for those types is disabled. --S:: +`-S`:: Look for differences that change the number of occurrences of - the specified string (i.e. addition/deletion) in a file. + the specified __ (i.e. addition/deletion) in a file. Intended for the scripter's use. + It is useful when you're looking for an exact block of code (like a @@ -662,11 +662,11 @@ very first version of the block. + Binary files are searched as well. --G:: +`-G`:: Look for differences whose patch text contains added/removed - lines that match . + lines that match __. + -To illustrate the difference between `-S --pickaxe-regex` and +To illustrate the difference between `-S` `--pickaxe-regex` and `-G`, consider a commit with the following diff in the same file: + @@ -686,7 +686,7 @@ filter will be ignored. See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information. ---find-object=:: +`--find-object=`:: Look for differences that change the number of occurrences of the specified object. Similar to `-S`, just the argument is different in that it doesn't search for a specific string but for a specific @@ -695,25 +695,25 @@ information. The object can be a blob or a submodule commit. It implies the `-t` option in `git-log` to also find trees. ---pickaxe-all:: +`--pickaxe-all`:: When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change - in . + in __. ---pickaxe-regex:: - Treat the given to `-S` as an extended POSIX regular +`--pickaxe-regex`:: + Treat the __ given to `-S` as an extended POSIX regular expression to match. endif::git-format-patch[] --O:: +`-O`:: Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`. + The output order is determined by the order of glob patterns in -. +__. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. @@ -724,7 +724,7 @@ If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order. + - is parsed as follows: +__ is parsed as follows: + -- - Blank lines are ignored, so they can be used as separators for @@ -738,106 +738,107 @@ the normal order. -- + Patterns have the same syntax and semantics as patterns used for -fnmatch(3) without the FNM_PATHNAME flag, except a pathname also +`fnmatch`(3) without the `FNM_PATHNAME` flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "`foo*bar`" matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`". ---skip-to=:: ---rotate-to=:: - Discard the files before the named from the output +`--skip-to=`:: +`--rotate-to=`:: + Discard the files before the named __ from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to'). These options were invented primarily for the use of the `git difftool` command, and may not be very useful otherwise. ifndef::git-format-patch[] --R:: +`-R`:: Swap two inputs; that is, show differences from index or on-disk file to tree contents. endif::git-format-patch[] ---relative[=]:: ---no-relative:: +`--relative[=]`:: +`--no-relative`:: When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative - to by giving a as an argument. + to by giving a __ as an argument. `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`. --a:: ---text:: +`-a`:: +`--text`:: Treat all files as text. ---ignore-cr-at-eol:: +`--ignore-cr-at-eol`:: Ignore carriage-return at the end of line when doing a comparison. ---ignore-space-at-eol:: +`--ignore-space-at-eol`:: Ignore changes in whitespace at EOL. --b:: ---ignore-space-change:: +`-b`:: +`--ignore-space-change`:: Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent. --w:: ---ignore-all-space:: +`-w`:: +`--ignore-all-space`:: Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none. ---ignore-blank-lines:: +`--ignore-blank-lines`:: Ignore changes whose lines are all blank. --I:: ---ignore-matching-lines=:: - Ignore changes whose all lines match . This option may + +`-I`:: +`--ignore-matching-lines=`:: + Ignore changes whose all lines match __. This option may be specified more than once. ---inter-hunk-context=:: - Show the context between diff hunks, up to the specified number +`--inter-hunk-context=`:: + Show the context between diff hunks, up to the specified __ of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset. --W:: ---function-context:: +`-W`:: +`--function-context`:: Show whole function as context lines for each change. The function names are determined in the same way as - `git diff` works out patch hunk headers (see 'Defining a - custom hunk-header' in linkgit:gitattributes[5]). + `git diff` works out patch hunk headers (see "Defining a + custom hunk-header" in linkgit:gitattributes[5]). ifndef::git-format-patch[] ifndef::git-log[] ---exit-code:: - Make the program exit with codes similar to diff(1). +`--exit-code`:: + Make the program exit with codes similar to `diff`(1). That is, it exits with 1 if there were differences and 0 means no differences. ---quiet:: +`--quiet`:: Disable all output of the program. Implies `--exit-code`. Disables execution of external diff helpers whose exit code is not trusted, i.e. their respective configuration option - `diff.trustExitCode` or `diff..trustExitCode` or + `diff.trustExitCode` or ++diff.++____++.trustExitCode++ or environment variable `GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE` is false. endif::git-log[] endif::git-format-patch[] ---ext-diff:: +`--ext-diff`:: Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends. ---no-ext-diff:: +`--no-ext-diff`:: Disallow external diff drivers. ---textconv:: ---no-textconv:: +`--textconv`:: +`--no-textconv`:: Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way @@ -847,42 +848,42 @@ endif::git-format-patch[] linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands. ---ignore-submodules[=]:: - Ignore changes to submodules in the diff generation. can be - either "none", "untracked", "dirty" or "all", which is the default. - Using "none" will consider the submodule modified when it either contains - untracked or modified files or its HEAD differs from the commit recorded + +`--ignore-submodules[=(none|untracked|dirty|all)]`:: + Ignore changes to submodules in the diff generation. `all` is the default. + Using `none` will consider the submodule modified when it either contains + untracked or modified files or its `HEAD` differs from the commit recorded in the superproject and can be used to override any settings of the - 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When - "untracked" is used submodules are not considered dirty when they only + `ignore` option in linkgit:git-config[1] or linkgit:gitmodules[5]. When + `untracked` is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified - content). Using "dirty" ignores all changes to the work tree of submodules, + content). Using `dirty` ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was - the behavior until 1.7.0). Using "all" hides all changes to submodules. + the behavior until 1.7.0). Using `all` hides all changes to submodules. ---src-prefix=:: - Show the given source prefix instead of "a/". +`--src-prefix=`:: + Show the given source __ instead of "a/". ---dst-prefix=:: - Show the given destination prefix instead of "b/". +`--dst-prefix=`:: + Show the given destination __ instead of "b/". ---no-prefix:: +`--no-prefix`:: Do not show any source or destination prefix. ---default-prefix:: +`--default-prefix`:: Use the default source and destination prefixes ("a/" and "b/"). This overrides configuration variables such as `diff.noprefix`, `diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix` - (see `git-config`(1)). + (see linkgit:git-config[1]). ---line-prefix=:: - Prepend an additional prefix to every line of output. +`--line-prefix=`:: + Prepend an additional __ to every line of output. ---ita-invisible-in-index:: - By default entries added by "git add -N" appear as an existing - empty file in "git diff" and a new file in "git diff --cached". - This option makes the entry appear as a new file in "git diff" - and non-existent in "git diff --cached". This option could be +`--ita-invisible-in-index`:: + By default entries added by `git add -N` appear as an existing + empty file in `git diff` and a new file in `git diff --cached`. + This option makes the entry appear as a new file in `git diff` + and non-existent in `git diff --cached`. This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future. diff --git a/everyday.html b/everyday.html index 1cefe924..7bbce30c 100644 --- a/everyday.html +++ b/everyday.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/fsck-msgids.txt b/fsck-msgids.txt index 68a2801f..b14bc44c 100644 --- a/fsck-msgids.txt +++ b/fsck-msgids.txt @@ -19,12 +19,18 @@ `badParentSha1`:: (ERROR) A commit object has a bad parent sha1. +`badRefContent`:: + (ERROR) A ref has bad content. + `badRefFiletype`:: (ERROR) A ref has a bad file type. `badRefName`:: (ERROR) A ref has an invalid format. +`badReferentName`:: + (ERROR) The referent name of a symref is invalid. + `badTagName`:: (INFO) A tag has an invalid format. @@ -170,6 +176,35 @@ `nullSha1`:: (WARN) Tree contains entries pointing to a null sha1. +`refMissingNewline`:: + (INFO) A loose ref that does not end with newline(LF). As + valid implementations of Git never created such a loose ref + file, it may become an error in the future. Report to the + git@vger.kernel.org mailing list if you see this error, as + we need to know what tools created such a file. + +`symlinkRef`:: + (INFO) A symbolic link is used as a symref. Report to the + git@vger.kernel.org mailing list if you see this error, as we + are assessing the feasibility of dropping the support to drop + creating symbolic links as symrefs. + +`symrefTargetIsNotARef`:: + (INFO) The target of a symbolic reference points neither to + a root reference nor to a reference starting with "refs/". + Although we allow create a symref pointing to the referent which + is outside the "ref" by using `git symbolic-ref`, we may tighten + the rule in the future. Report to the git@vger.kernel.org + mailing list if you see this error, as we need to know what tools + created such a file. + +`trailingRefContent`:: + (INFO) A loose ref has trailing content. As valid implementations + of Git never created such a loose ref file, it may become an + error in the future. Report to the git@vger.kernel.org mailing + list if you see this error, as we need to know what tools + created such a file. + `treeNotSorted`:: (ERROR) A tree is not properly sorted. diff --git a/git-config.html b/git-config.html index f232c5a4..f07aa3e0 100644 --- a/git-config.html +++ b/git-config.html @@ -3918,23 +3918,24 @@ when trying to lock the credentials file. A value of 0 means not to retry at all; -1 means to try indefinitely. Default is 1000 (i.e., retry for 1s).

-
diff.autoRefreshIndex
+
diff.autoRefreshIndex
-

When using git diff to compare with work tree +

When using git diff to compare with work tree files, do not consider stat-only changes as changed. Instead, silently run git update-index --refresh to update the cached stat information for paths whose contents in the work tree match the contents in the -index. This option defaults to true. Note that this -affects only git diff Porcelain, and not lower level -diff commands such as git diff-files.

+index. This option defaults to true. Note that this +affects only git diff Porcelain, and not lower level +diff commands such as git diff-files.

-
diff.dirstat
+
diff.dirstat

A comma separated list of --dirstat parameters specifying the default behavior of the --dirstat option to git-diff(1) -and friends. The defaults can be overridden on the command line -(using --dirstat=<param1,param2,...>). The fallback defaults +and friends. +The defaults can be overridden on the command line +(using --dirstat=<param>,...). The fallback defaults (when not changed by diff.dirstat) are changes,noncumulative,3. The following parameters are available:

@@ -3973,7 +3974,7 @@ Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.

-
<limit>
+
<limit>

An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes @@ -3990,66 +3991,66 @@ and accumulating child directory counts in the parent directories: files,10,cumulative.

-
diff.statNameWidth
+
diff.statNameWidth
-

Limit the width of the filename part in --stat output. If set, applies -to all commands generating --stat output except format-patch.

+

Limit the width of the filename part in --stat output. If set, applies +to all commands generating --stat output except format-patch.

-
diff.statGraphWidth
+
diff.statGraphWidth
-

Limit the width of the graph part in --stat output. If set, applies -to all commands generating --stat output except format-patch.

+

Limit the width of the graph part in --stat output. If set, applies +to all commands generating --stat output except format-patch.

-
diff.context
+
diff.context
-

Generate diffs with <n> lines of context instead of the default -of 3. This value is overridden by the -U option.

+

Generate diffs with <n> lines of context instead of the default +of 3. This value is overridden by the -U option.

-
diff.interHunkContext
+
diff.interHunkContext

Show the context between diff hunks, up to the specified number of lines, thereby fusing the hunks that are close to each other. This value serves as the default for the --inter-hunk-context command line option.

-
diff.external
+
diff.external

If this config variable is set, diff generation is not performed using the internal diff machinery, but using the -given command. Can be overridden with the ‘GIT_EXTERNAL_DIFF’ +given command. Can be overridden with the GIT_EXTERNAL_DIFF environment variable. The command is called with parameters as described under "git Diffs" in git(1). Note: if you want to use an external diff program only on a subset of your files, you might want to use gitattributes(5) instead.

-
diff.trustExitCode
+
diff.trustExitCode
-

If this boolean value is set to true then the +

If this boolean value is set to true then the diff.external command is expected to return exit code 0 if it considers the input files to be equal or 1 if it -considers them to be different, like diff(1). -If it is set to false, which is the default, then the command -is expected to return exit code 0 regardless of equality. +considers them to be different, like diff(1). +If it is set to false, which is the default, then the command +is expected to return exit code 0 regardless of equality. Any other exit code causes Git to report a fatal error.

-
diff.ignoreSubmodules
+
diff.ignoreSubmodules
-

Sets the default value of --ignore-submodules. Note that this -affects only git diff Porcelain, and not lower level diff -commands such as git diff-files. git checkout -and git switch also honor +

Sets the default value of --ignore-submodules. Note that this +affects only git diff Porcelain, and not lower level diff +commands such as git diff-files. git checkout +and git switch also honor this setting when reporting uncommitted changes. Setting it to -all disables the submodule summary normally shown by git commit -and git status when status.submoduleSummary is set unless it is -overridden by using the --ignore-submodules command-line option. -The git submodule commands are not affected by this setting. +all disables the submodule summary normally shown by git commit +and git status when status.submoduleSummary is set unless it is +overridden by using the --ignore-submodules command-line option. +The git submodule commands are not affected by this setting. By default this is set to untracked so that any untracked submodules are ignored.

-
diff.mnemonicPrefix
+
diff.mnemonicPrefix
-

If set, git diff uses a prefix pair that is different from the -standard "a/" and "b/" depending on what is being compared. When +

If set, git diff uses a prefix pair that is different from the +standard a/ and b/ depending on what is being compared. When this configuration is in effect, reverse diff output also swaps the order of the prefixes:

@@ -4066,121 +4067,121 @@ the order of the prefixes:

compares a (c)ommit and the (i)ndex;

-
git diff HEAD:file1 file2
+
git diff HEAD:<file1> <file2>

compares an (o)bject and a (w)ork tree entity;

-
git diff --no-index a b
+
git diff --no-index <a> <b>
-

compares two non-git things (1) and (2).

+

compares two non-git things <a> and <b>.

-
diff.noPrefix
+
diff.noPrefix
-

If set, git diff does not show any source or destination prefix.

+

If set, git diff does not show any source or destination prefix.

-
diff.srcPrefix
+
diff.srcPrefix
-

If set, git diff uses this source prefix. Defaults to "a/".

+

If set, git diff uses this source prefix. Defaults to a/.

-
diff.dstPrefix
+
diff.dstPrefix
-

If set, git diff uses this destination prefix. Defaults to "b/".

+

If set, git diff uses this destination prefix. Defaults to b/.

-
diff.relative
+
diff.relative
-

If set to true, git diff does not show changes outside of the directory +

If set to true, git diff does not show changes outside of the directory and show pathnames relative to the current directory.

-
diff.orderFile
+
diff.orderFile

File indicating how to order files within a diff. -See the -O option to git-diff(1) for details. +See the -O option to git-diff(1) for details. If diff.orderFile is a relative pathname, it is treated as relative to the top of the working tree.

-
diff.renameLimit
+
diff.renameLimit

The number of files to consider in the exhaustive portion of -copy/rename detection; equivalent to the git diff option +copy/rename detection; equivalent to the git diff option -l. If not set, the default value is currently 1000. This setting has no effect if rename detection is turned off.

-
diff.renames
+
diff.renames
-

Whether and how Git detects renames. If set to "false", -rename detection is disabled. If set to "true", basic rename -detection is enabled. If set to "copies" or "copy", Git will -detect copies, as well. Defaults to true. Note that this -affects only git diff Porcelain like git-diff(1) and +

Whether and how Git detects renames. If set to false, +rename detection is disabled. If set to true, basic rename +detection is enabled. If set to copies or copy, Git will +detect copies, as well. Defaults to true. Note that this +affects only git diff Porcelain like git-diff(1) and git-log(1), and not lower level commands such as git-diff-files(1).

-
diff.suppressBlankEmpty
+
diff.suppressBlankEmpty

A boolean to inhibit the standard behavior of printing a space -before each empty output line. Defaults to false.

+before each empty output line. Defaults to false.

-
diff.submodule
+
diff.submodule

Specify the format in which differences in submodules are -shown. The "short" format just shows the names of the commits -at the beginning and end of the range. The "log" format lists +shown. The short format just shows the names of the commits +at the beginning and end of the range. The log format lists the commits in the range like git-submodule(1) summary -does. The "diff" format shows an inline diff of the changed -contents of the submodule. Defaults to "short".

+does. The diff format shows an inline diff of the changed +contents of the submodule. Defaults to short.

-
diff.wordRegex
+
diff.wordRegex

A POSIX Extended Regular Expression used to determine what is a "word" when performing word-by-word difference calculations. Character sequences that match the regular expression are "words", all other characters are ignorable whitespace.

-
diff.<driver>.command
+
diff.<driver>.command

The custom diff driver command. See gitattributes(5) for details.

-
diff.<driver>.trustExitCode
+
diff.<driver>.trustExitCode
-

If this boolean value is set to true then the +

If this boolean value is set to true then the diff.<driver>.command command is expected to return exit code 0 if it considers the input files to be equal or 1 if it -considers them to be different, like diff(1). -If it is set to false, which is the default, then the command +considers them to be different, like diff(1). +If it is set to false, which is the default, then the command is expected to return exit code 0 regardless of equality. Any other exit code causes Git to report a fatal error.

-
diff.<driver>.xfuncname
+
diff.<driver>.xfuncname

The regular expression that the diff driver should use to recognize the hunk header. A built-in pattern may also be used. See gitattributes(5) for details.

-
diff.<driver>.binary
+
diff.<driver>.binary
-

Set this option to true to make the diff driver treat files as +

Set this option to true to make the diff driver treat files as binary. See gitattributes(5) for details.

-
diff.<driver>.textconv
+
diff.<driver>.textconv

The command that the diff driver should call to generate the text-converted version of a file. The result of the conversion is used to generate a human-readable diff. See gitattributes(5) for details.

-
diff.<driver>.wordRegex
+
diff.<driver>.wordRegex

The regular expression that the diff driver should use to split words in a line. See gitattributes(5) for details.

-
diff.<driver>.cachetextconv
+
diff.<driver>.cachetextconv
-

Set this option to true to make the diff driver cache the text +

Set this option to true to make the diff driver cache the text conversion outputs. See gitattributes(5) for details.

@@ -4287,19 +4288,20 @@ conversion outputs. See gitattributes(5) for d
-
diff.indentHeuristic
+
diff.indentHeuristic

Set this option to false to disable the default heuristics that shift diff hunk boundaries to make patches easier to read.

-
diff.algorithm
+
diff.algorithm

Choose a diff algorithm. The variants are as follows:

-
default, myers
+
default
+
myers

The basic greedy diff algorithm. Currently, this is the default.

@@ -4322,7 +4324,7 @@ low-occurrence common elements".

-
diff.wsErrorHighlight
+
diff.wsErrorHighlight

Highlight whitespace errors in the context, old or new lines of the diff. Multiple values are separated by comma, @@ -4332,19 +4334,19 @@ whitespace errors are colored with color.diff.whitespace. The command line option --ws-error-highlight=<kind> overrides this setting.

-
diff.colorMoved
+
diff.colorMoved
-

If set to either a valid <mode> or a true value, moved lines -in a diff are colored differently, for details of valid modes -see --color-moved in git-diff(1). If simply set to -true the default color mode will be used. When set to false, -moved lines are not colored.

+

If set to either a valid <mode> or a true value, moved lines +in a diff are colored differently. +For details of valid modes see --color-moved in git-diff(1). +If simply set to true the default color mode will be used. When +set to false, moved lines are not colored.

-
diff.colorMovedWS
+
diff.colorMovedWS

When moved lines are colored using e.g. the diff.colorMoved setting, -this option controls the <mode> how spaces are treated. -For details of valid modes see --color-moved-ws in git-diff(1).

+this option controls the mode how spaces are treated. +For details of valid modes see --color-moved-ws in git-diff(1).

diff.tool
diff --git a/git-diff-files.html b/git-diff-files.html index c4d21547..780e1331 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -471,71 +471,71 @@ same as for git diff-index and git diff-tree.

-
-p
-
-u
-
--patch
+
-p
+
-u
+
--patch

Generate patch (see Generating patch text with -p).

-
-s
-
--no-patch
+
-s
+
--no-patch

Suppress all output from the diff machinery. Useful for commands like git show that show the patch by default to squelch their output, or to cancel the effect of options like --patch, --stat earlier on the command line in an alias.

-
-U<n>
-
--unified=<n>
+
-U<n>
+
--unified=<n>
-

Generate diffs with <n> lines of context instead of +

Generate diffs with <n> lines of context instead of the usual three. Implies --patch.

-
--output=<file>
+
--output=<file>

Output to a specific file instead of stdout.

-
--output-indicator-new=<char>
-
--output-indicator-old=<char>
-
--output-indicator-context=<char>
+
--output-indicator-new=<char>
+
--output-indicator-old=<char>
+
--output-indicator-context=<char>

Specify the character used to indicate new, old or context -lines in the generated patch. Normally they are +, - and +lines in the generated patch. Normally they are +, - and ' ' respectively.

-
--raw
+
--raw

Generate the diff in raw format. This is the default.

-
--patch-with-raw
+
--patch-with-raw

Synonym for -p --raw.

-
--indent-heuristic
+
--indent-heuristic

Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default.

-
--no-indent-heuristic
+
--no-indent-heuristic

Disable the indent heuristic.

-
--minimal
+
--minimal

Spend extra time to make sure the smallest possible diff is produced.

-
--patience
+
--patience

Generate a diff using the "patience diff" algorithm.

-
--histogram
+
--histogram

Generate a diff using the "histogram diff" algorithm.

-
--anchored=<text>
+
--anchored=<text>

Generate a diff using the "anchored diff" algorithm.

@@ -543,19 +543,20 @@ diff is produced.

If a line exists in both the source and destination, exists only once, -and starts with this text, this algorithm attempts to prevent it from +and starts with <text>, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the "patience diff" algorithm internally.

-
--diff-algorithm={patience|minimal|histogram|myers}
+
--diff-algorithm=(patience|minimal|histogram|myers)

Choose a diff algorithm. The variants are as follows:

-
default, myers
+
default
+
myers

The basic greedy diff algorithm. Currently, this is the default.

@@ -583,7 +584,7 @@ non-default value and want to use the default one, then you have to use --diff-algorithm=default option.

-
--stat[=<width>[,<name-width>[,<count>]]]
+
--stat[=<width>[,<name-width>[,<count>]]]

Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph @@ -591,9 +592,9 @@ part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by giving another width <name-width> after a comma or by setting -diff.statNameWidth=<width>. The width of the graph part can be -limited by using --stat-graph-width=<width> or by setting -diff.statGraphWidth=<width>. Using --stat or +diff.statNameWidth=<name-width>. The width of the graph part can be +limited by using --stat-graph-width=<graph-width> or by setting +diff.statGraphWidth=<graph-width>. Using --stat or --stat-graph-width affects all commands generating a stat graph, while setting diff.statNameWidth or diff.statGraphWidth does not affect git format-patch. @@ -604,16 +605,16 @@ the first <count> lines, followed by ... if there are more.

--stat-name-width=<name-width> and --stat-count=<count>.

-
--compact-summary
+
--compact-summary

Output a condensed summary of extended header information such -as file creations or deletions ("new" or "gone", optionally "+l" -if it’s a symlink) and mode changes ("+x" or "-x" for adding +as file creations or deletions ("new" or "gone", optionally +l +if it’s a symlink) and mode changes (+x or -x for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies --stat.

-
--numstat
+
--numstat

Similar to --stat, but shows number of added and deleted lines in decimal notation and pathname without @@ -621,14 +622,14 @@ abbreviation, to make it more machine friendly. For binary files, outputs two - instead of saying 0 0.

-
--shortstat
+
--shortstat

Output only the last line of the --stat format containing total number of modified files, as well as number of added and deleted lines.

-
-X[<param1,param2,…​>]
-
--dirstat[=<param1,param2,…​>]
+
-X [<param>,...]
+
--dirstat[=<param>,...]

Output the distribution of relative amount of changes for each sub-directory. The behavior of --dirstat can be customized by @@ -672,7 +673,7 @@ Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.

-
<limit>
+
<limit>

An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes @@ -689,24 +690,24 @@ and accumulating child directory counts in the parent directories: --dirstat=files,10,cumulative.

-
--cumulative
+
--cumulative
-

Synonym for --dirstat=cumulative

+

Synonym for --dirstat=cumulative.

-
--dirstat-by-file[=<param1,param2>…​]
+
--dirstat-by-file[=<param>,...]
-

Synonym for --dirstat=files,<param1>,<param2>…​

+

Synonym for --dirstat=files,<param>,....

-
--summary
+
--summary

Output a condensed summary of extended header information such as creations, renames and mode changes.

-
--patch-with-stat
+
--patch-with-stat

Synonym for -p --stat.

-
-z
+
-z

When --raw, --numstat, --name-only or --name-status has been given, do not munge pathnames and use NULs as output field terminators.

@@ -716,88 +717,88 @@ explained for the configuration variable core.quotePath (see git-config(1)).

-
--name-only
+
--name-only

Show only the name of each changed file in the post-image tree. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the git-log(1) manual page.

-
--name-status
+
--name-status

Show only the name(s) and status of each changed file. See the description of the --diff-filter option on what the status letters mean. Just like --name-only the file names are often encoded in UTF-8.

-
--submodule[=<format>]
+
--submodule[=<format>]

Specify how differences in submodules are shown. When specifying ---submodule=short the short format is used. This format just +--submodule=short the short format is used. This format just shows the names of the commits at the beginning and end of the range. -When --submodule or --submodule=log is specified, the log +When --submodule or --submodule=log is specified, the log format is used. This format lists the commits in the range like git-submodule(1) summary does. When --submodule=diff -is specified, the diff format is used. This format shows an +is specified, the diff format is used. This format shows an inline diff of the changes in the submodule contents between the -commit range. Defaults to diff.submodule or the short format +commit range. Defaults to diff.submodule or the short format if the config option is unset.

-
--color[=<when>]
+
--color[=<when>]

Show colored diff. ---color (i.e. without =<when>) is the same as --color=always. +--color (i.e. without =<when>) is the same as --color=always. <when> can be one of always, never, or auto.

-
--no-color
+
--no-color

Turn off colored diff. It is the same as --color=never.

-
--color-moved[=<mode>]
+
--color-moved[=<mode>]

Moved lines of code are colored differently. -The <mode> defaults to no if the option is not given -and to zebra if the option with no mode is given. +The <mode> defaults to no if the option is not given +and to zebra if the option with no mode is given. The mode must be one of:

-
no
+
no

Moved lines are not highlighted.

-
default
+
default

Is a synonym for zebra. This may change to a more sensible mode in the future.

-
plain
+
plain

Any line that is added in one location and was removed -in another location will be colored with color.diff.newMoved. -Similarly color.diff.oldMoved will be used for removed lines +in another location will be colored with color.diff.newMoved. +Similarly color.diff.oldMoved will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation.

-
blocks
+
blocks

Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are -painted using either the color.diff.{old,new}Moved color. +painted using either the color.diff.(old|new)Moved color. Adjacent blocks cannot be told apart.

-
zebra
+
zebra
-

Blocks of moved text are detected as in blocks mode. The blocks -are painted using either the color.diff.{old,new}Moved color or -color.diff.{old,new}MovedAlternative. The change between +

Blocks of moved text are detected as in blocks mode. The blocks +are painted using either the color.diff.(old|new)Moved color or +color.diff.(old|new)MovedAlternative. The change between the two colors indicates that a new block was detected.

-
dimmed-zebra
+
dimmed-zebra
-

Similar to zebra, but additional dimming of uninteresting parts +

Similar to zebra, but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. dimmed_zebra is a deprecated synonym.

@@ -807,12 +808,12 @@ blocks are considered interesting, the rest is uninteresting.
-
--no-color-moved
+
--no-color-moved

Turn off move detection. This can be used to override configuration settings. It is the same as --color-moved=no.

-
--color-moved-ws=<modes>
+
--color-moved-ws=<mode>,...

This configures how whitespace is ignored when performing the move detection for --color-moved. @@ -821,26 +822,26 @@ These modes can be given as a comma separated list:

-
no
+
no

Do not ignore whitespace when performing move detection.

-
ignore-space-at-eol
+
ignore-space-at-eol

Ignore changes in whitespace at EOL.

-
ignore-space-change
+
ignore-space-change

Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

-
ignore-all-space
+
ignore-all-space

Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

-
allow-indentation-change
+
allow-indentation-change

Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in @@ -852,33 +853,32 @@ other modes.

-
--no-color-moved-ws
+
--no-color-moved-ws

Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as --color-moved-ws=no.

-
--word-diff[=<mode>]
+
--word-diff[=<mode>]
-

Show a word diff, using the <mode> to delimit changed words. -By default, words are delimited by whitespace; see ---word-diff-regex below. The <mode> defaults to plain, and +

By default, words are delimited by whitespace; see +--word-diff-regex below. The <mode> defaults to plain, and must be one of:

-
color
+
color

Highlight changed words using only colors. Implies --color.

-
plain
+
plain
-

Show words as [-removed-] and {+added+}. Makes no +

Show words as [-removed-] and {added}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.

-
porcelain
+
porcelain

Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the @@ -887,7 +887,7 @@ character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde ~ on a line of its own.

-
none
+
none

Disable word diff again.

@@ -900,14 +900,14 @@ tilde ~ on a line of its own.

highlight the changed parts in all modes if enabled.

-
--word-diff-regex=<regex>
+
--word-diff-regex=<regex>
-

Use <regex> to decide what a word is, instead of considering +

Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies --word-diff unless it was already enabled.

Every non-overlapping match of the -<regex> is considered a word. Anything between these matches is +<regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append |[^[:space:]] to your regular expression to make sure that it matches all non-whitespace characters. @@ -925,21 +925,21 @@ overrides any diff driver or configuration setting. Diff drivers override configuration settings.

-
--color-words[=<regex>]
+
--color-words[=<regex>]

Equivalent to --word-diff=color plus (if a regex was specified) --word-diff-regex=<regex>.

-
--no-renames
+
--no-renames

Turn off rename detection, even when the configuration file gives the default to do so.

-
--[no-]rename-empty
+
--[no-]rename-empty

Whether to use empty blobs as rename source.

-
--check
+
--check

Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by core.whitespace @@ -948,9 +948,9 @@ lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible -with --exit-code.

+with --exit-code.

-
--ws-error-highlight=<kind>
+
--ws-error-highlight=<kind>

Highlight whitespace errors in the context, old or new lines of the diff. Multiple values are separated by comma, @@ -961,19 +961,19 @@ this option is not given, and the configuration variable new lines are highlighted. The whitespace errors are colored with color.diff.whitespace.

-
--full-index
+
--full-index

Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output.

-
--binary
+
--binary

In addition to --full-index, output a binary diff that can be applied with git-apply. Implies --patch.

-
--abbrev[=<n>]
+
--abbrev[=<n>]

Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header @@ -984,8 +984,8 @@ precedence, i.e. if --full-index is specified, full blob names will be shown regardless of --abbrev. Non default number of digits can be specified with --abbrev=<n>.

-
-B[<n>][/<m>]
-
--break-rewrites[=[<n>][/<m>]]
+
-B[<n>][/<m>]
+
--break-rewrites[=[<n>][/<m>]]

Break complete rewrite changes into pairs of delete and create. This serves two purposes:

@@ -994,27 +994,27 @@ create. This serves two purposes:

not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of -everything new, and the number m controls this aspect of the -B +everything new, and the number <m> controls this aspect of the -B option (defaults to 60%). -B/70% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).

-

When used with -M, a totally-rewritten file is also considered as the -source of a rename (usually -M only considers a file that disappeared -as the source of a rename), and the number n controls this aspect of -the -B option (defaults to 50%). -B20% specifies that a change with +

When used with -M, a totally-rewritten file is also considered as the +source of a rename (usually -M only considers a file that disappeared +as the source of a rename), and the number <n> controls this aspect of +the -B option (defaults to 50%). -B20% specifies that a change with addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.

-
-M[<n>]
-
--find-renames[=<n>]
+
-M[<n>]
+
--find-renames[=<n>]

Detect renames. -If n is specified, it is a threshold on the similarity +If <n> is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file’s size). For example, -M90% means Git should consider a delete/add pair to be a rename if more than 90% of the file @@ -1024,13 +1024,13 @@ a fraction, with a decimal point before it. I.e., -M5 becomes the same as -M5%. To limit detection to exact renames, use -M100%. The default similarity index is 50%.

-
-C[<n>]
-
--find-copies[=<n>]
+
-C[<n>]
+
--find-copies[=<n>]

Detect copies as well as renames. See also --find-copies-harder. -If n is specified, it has the same meaning as for -M<n>.

+If <n> is specified, it has the same meaning as for -M<n>.

-
--find-copies-harder
+
--find-copies-harder

For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same @@ -1040,8 +1040,8 @@ copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one -C option has the same effect.

-
-D
-
--irreversible-delete
+
-D
+
--irreversible-delete

Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and /dev/null. The resulting patch @@ -1055,7 +1055,7 @@ hence the name of the option.

of a delete/create pair.

-
-l<num>
+
-l<num>

The -M and -C options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an @@ -1066,10 +1066,10 @@ original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved -exceeds the specified number. Defaults to diff.renameLimit. +exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited.

-
--diff-filter=[(A|C|D|M|R|T|U|X|B)…​[*]]
+
--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]

Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their @@ -1090,10 +1090,10 @@ that matches other criteria, nothing is selected.

renamed entries cannot appear if detection for those types is disabled.

-
-S<string>
+
-S<string>

Look for differences that change the number of occurrences of -the specified string (i.e. addition/deletion) in a file. +the specified <string> (i.e. addition/deletion) in a file. Intended for the scripter’s use.

It is useful when you’re looking for an exact block of code (like a @@ -1106,10 +1106,10 @@ very first version of the block.

Binary files are searched as well.

-
-G<regex>
+
-G<regex>

Look for differences whose patch text contains added/removed -lines that match <regex>.

+lines that match <regex>.

To illustrate the difference between -S<regex> --pickaxe-regex and -G<regex>, consider a commit with the following diff in the same @@ -1136,7 +1136,7 @@ filter will be ignored.

information.

-
--find-object=<object-id>
+
--find-object=<object-id>

Look for differences that change the number of occurrences of the specified object. Similar to -S, just the argument is different @@ -1147,18 +1147,18 @@ object id.

git-log to also find trees.

-
--pickaxe-all
+
--pickaxe-all

When -S or -G finds a change, show all the changes in that changeset, not just the files that contain the change -in <string>.

+in <string>.

-
--pickaxe-regex
+
--pickaxe-regex
-

Treat the <string> given to -S as an extended POSIX regular +

Treat the <string> given to -S as an extended POSIX regular expression to match.

-
-O<orderfile>
+
-O<orderfile>

Control the order in which files appear in the output. This overrides the diff.orderFile configuration variable @@ -1166,7 +1166,7 @@ This overrides the diff.orderFile configuration variable use -O/dev/null.

The output order is determined by the order of glob patterns in -<orderfile>. +<orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. @@ -1178,7 +1178,7 @@ but no earlier patterns), their output order relative to each other is the normal order.

-

<orderfile> is parsed as follows:

+

<orderfile> is parsed as follows:

@@ -1202,117 +1202,117 @@ pattern if it starts with a hash.

Patterns have the same syntax and semantics as patterns used for -fnmatch(3) without the FNM_PATHNAME flag, except a pathname also +fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "foo*bar" matches "fooasdfbar" and "foo/bar/baz/asdf" but not "foobarx".

-
--skip-to=<file>
-
--rotate-to=<file>
+
--skip-to=<file>
+
--rotate-to=<file>
-

Discard the files before the named <file> from the output +

Discard the files before the named <file> from the output (i.e. skip to), or move them to the end of the output (i.e. rotate to). These options were invented primarily for the use of the git difftool command, and may not be very useful otherwise.

-
-R
+
-R

Swap two inputs; that is, show differences from index or on-disk file to tree contents.

-
--relative[=<path>]
-
--no-relative
+
--relative[=<path>]
+
--no-relative

When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative -to by giving a <path> as an argument. +to by giving a <path> as an argument. --no-relative can be used to countermand both diff.relative config option and previous --relative.

-
-a
-
--text
+
-a
+
--text

Treat all files as text.

-
--ignore-cr-at-eol
+
--ignore-cr-at-eol

Ignore carriage-return at the end of line when doing a comparison.

-
--ignore-space-at-eol
+
--ignore-space-at-eol

Ignore changes in whitespace at EOL.

-
-b
-
--ignore-space-change
+
-b
+
--ignore-space-change

Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

-
-w
-
--ignore-all-space
+
-w
+
--ignore-all-space

Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

-
--ignore-blank-lines
+
--ignore-blank-lines

Ignore changes whose lines are all blank.

-
-I<regex>
-
--ignore-matching-lines=<regex>
+
-I<regex>
+
--ignore-matching-lines=<regex>
-

Ignore changes whose all lines match <regex>. This option may +

Ignore changes whose all lines match <regex>. This option may be specified more than once.

-
--inter-hunk-context=<lines>
+
--inter-hunk-context=<number>
-

Show the context between diff hunks, up to the specified number +

Show the context between diff hunks, up to the specified <number> of lines, thereby fusing hunks that are close to each other. Defaults to diff.interHunkContext or 0 if the config option is unset.

-
-W
-
--function-context
+
-W
+
--function-context

Show whole function as context lines for each change. The function names are determined in the same way as -git diff works out patch hunk headers (see Defining a -custom hunk-header in gitattributes(5)).

+git diff works out patch hunk headers (see "Defining a +custom hunk-header" in gitattributes(5)).

-
--exit-code
+
--exit-code
-

Make the program exit with codes similar to diff(1). +

Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences.

-
--quiet
+
--quiet

Disable all output of the program. Implies --exit-code. Disables execution of external diff helpers whose exit code is not trusted, i.e. their respective configuration option -diff.trustExitCode or diff.<driver>.trustExitCode or +diff.trustExitCode or diff.<driver>.trustExitCode or environment variable GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE is false.

-
--ext-diff
+
--ext-diff

Allow an external diff helper to be executed. If you set an external diff driver with gitattributes(5), you need to use this option with git-log(1) and friends.

-
--no-ext-diff
+
--no-ext-diff

Disallow external diff drivers.

-
--textconv
-
--no-textconv
+
--textconv
+
--no-textconv

Allow (or disallow) external text conversion filters to be run when comparing binary files. See gitattributes(5) for @@ -1323,49 +1323,48 @@ filters are enabled by default only for git-diff(1) git-log(1), but not for git-format-patch(1) or diff plumbing commands.

-
--ignore-submodules[=<when>]
+
--ignore-submodules[=(none|untracked|dirty|all)]
-

Ignore changes to submodules in the diff generation. <when> can be -either "none", "untracked", "dirty" or "all", which is the default. -Using "none" will consider the submodule modified when it either contains -untracked or modified files or its HEAD differs from the commit recorded +

Ignore changes to submodules in the diff generation. all is the default. +Using none will consider the submodule modified when it either contains +untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the -ignore option in git-config(1) or gitmodules(5). When -"untracked" is used submodules are not considered dirty when they only +ignore option in git-config(1) or gitmodules(5). When +untracked is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified -content). Using "dirty" ignores all changes to the work tree of submodules, +content). Using dirty ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was -the behavior until 1.7.0). Using "all" hides all changes to submodules.

+the behavior until 1.7.0). Using all hides all changes to submodules.

-
--src-prefix=<prefix>
+
--src-prefix=<prefix>
-

Show the given source prefix instead of "a/".

+

Show the given source <prefix> instead of "a/".

-
--dst-prefix=<prefix>
+
--dst-prefix=<prefix>
-

Show the given destination prefix instead of "b/".

+

Show the given destination <prefix> instead of "b/".

-
--no-prefix
+
--no-prefix

Do not show any source or destination prefix.

-
--default-prefix
+
--default-prefix

Use the default source and destination prefixes ("a/" and "b/"). This overrides configuration variables such as diff.noprefix, diff.srcPrefix, diff.dstPrefix, and diff.mnemonicPrefix -(see git-config(1)).

+(see git-config(1)).

-
--line-prefix=<prefix>
+
--line-prefix=<prefix>
-

Prepend an additional prefix to every line of output.

+

Prepend an additional <prefix> to every line of output.

-
--ita-invisible-in-index
+
--ita-invisible-in-index
-

By default entries added by "git add -N" appear as an existing -empty file in "git diff" and a new file in "git diff --cached". -This option makes the entry appear as a new file in "git diff" -and non-existent in "git diff --cached". This option could be +

By default entries added by git add -N appear as an existing +empty file in git diff and a new file in git diff --cached. +This option makes the entry appear as a new file in git diff +and non-existent in git diff --cached. This option could be reverted with --ita-visible-in-index. Both options are experimental and could be removed in future.

@@ -1411,8 +1410,8 @@ commit with these flags.

Raw output format

-

The raw output format from "git-diff-index", "git-diff-tree", -"git-diff-files" and "git diff --raw" are very similar.

+

The raw output format from git-diff-index, git-diff-tree, +git-diff-files and git diff --raw are very similar.

These commands all compare two sets of things; what is @@ -1420,26 +1419,26 @@ compared differs:

-
git-diff-index <tree-ish>
+
git-diff-index <tree-ish>
-

compares the <tree-ish> and the files on the filesystem.

+

compares the <tree-ish> and the files on the filesystem.

-
git-diff-index --cached <tree-ish>
+
git-diff-index --cached <tree-ish>
-

compares the <tree-ish> and the index.

+

compares the <tree-ish> and the index.

-
git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…​]
+
git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]

compares the trees named by the two arguments.

-
git-diff-files [<pattern>…​]
+
git-diff-files [<pattern>...]

compares the index and the files on the filesystem.

-

The "git-diff-tree" command begins its output by printing the hash of +

The git-diff-tree command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file.

@@ -1514,36 +1513,36 @@ unmerged :000000 000000 0000000 0000000 U file6
  • -

    A: addition of a file

    +

    A: addition of a file

  • -

    C: copy of a file into a new one

    +

    C: copy of a file into a new one

  • -

    D: deletion of a file

    +

    D: deletion of a file

  • -

    M: modification of the contents or mode of a file

    +

    M: modification of the contents or mode of a file

  • -

    R: renaming of a file

    +

    R: renaming of a file

  • -

    T: change in the type of the file (regular file, symbolic link or submodule)

    +

    T: change in the type of the file (regular file, symbolic link or submodule)

  • -

    U: file is unmerged (you must complete the merge before it can +

    U: file is unmerged (you must complete the merge before it can be committed)

  • -

    X: "unknown" change type (most probably a bug, please report it)

    +

    X: "unknown" change type (most probably a bug, please report it)

-

Status letters C and R are always followed by a score (denoting the +

Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or -copy). Status letter M may be followed by a score (denoting the +copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites.

@@ -1570,7 +1569,7 @@ verbatim and the line is terminated by a NUL byte.

diff format for merges

-

"git-diff-tree", "git-diff-files" and "git-diff --raw" +

git-diff-tree, git-diff-files and git-diff --raw can take -c or --cc option to generate diff output also for merge commits. The output differs from the format described above in the following way:

@@ -1643,7 +1642,7 @@ You can customize the creation of patch text via the (see git(1)), and the diff attribute (see gitattributes(5)).

-

What the -p option produces is slightly different from the traditional +

What the -p option produces is slightly different from the traditional diff format:

@@ -1668,23 +1667,21 @@ the file that the rename/copy produces, respectively.

  • It is followed by one or more extended header lines:

    -
    -
    -
    old mode <mode>
-new mode <mode>
-deleted file mode <mode>
-new file mode <mode>
-copy from <path>
-copy to <path>
-rename from <path>
-rename to <path>
-similarity index <number>
-dissimilarity index <number>
-index <hash>..<hash> <mode>
    -
    -
    -
    -

    File modes are printed as 6-digit octal numbers including the file type +

    +
    old mode <mode>
+new mode <mode>
+deleted file mode <mode>
+new file mode <mode>
+copy from <path>
+copy to <path>
+rename from <path>
+rename to <path>
+similarity index <number>
+dissimilarity index <number>
+index <hash>`..`<hash> <mode>
    +
    +
    +

    File modes <mode> are printed as 6-digit octal numbers including the file type and file permission bits.

    @@ -1700,7 +1697,7 @@ file made it into the new one.

    The index line includes the blob object names before and after the change. -The <mode> is included if the file mode does not change; otherwise, +The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode.

    • @@ -1802,20 +1799,18 @@ this (when the -c option is used):

  • It is followed by one or more extended header lines (this example shows a merge with two parents):

    -
    -
    -
    index <hash>,<hash>..<hash>
-mode <mode>,<mode>..<mode>
-new file mode <mode>
-deleted file mode <mode>,<mode>
    -
    +
    +
    index <hash>,<hash>`..__<hash>__
+{empty}`mode <mode>,<mode>``..``<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>

    The mode <mode>,<mode>..<mode> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two -<tree-ish> and are not used by combined diff format.

    +<tree-ish> and are not used by combined diff format.

  • @@ -1906,7 +1901,7 @@ two unresolved merge parents with the working tree file

    The --summary option describes newly added, deleted, renamed and -copied files. The --stat option adds diffstat(1) graph to the +copied files. The --stat option adds diffstat(1) graph to the output. These options can be combined with other options, such as -p, and are meant for human consumption.

    @@ -2020,7 +2015,7 @@ the pathname, but if that is NUL, the record will show two paths. diff --git a/git-diff-index.html b/git-diff-index.html index d04204a4..7634319a 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -472,71 +472,71 @@ files are compared.

    -
    -p
    -
    -u
    -
    --patch
    +
    -p
    +
    -u
    +
    --patch

    Generate patch (see Generating patch text with -p).

    -
    -s
    -
    --no-patch
    +
    -s
    +
    --no-patch

    Suppress all output from the diff machinery. Useful for commands like git show that show the patch by default to squelch their output, or to cancel the effect of options like --patch, --stat earlier on the command line in an alias.

    -
    -U<n>
    -
    --unified=<n>
    +
    -U<n>
    +
    --unified=<n>
    -

    Generate diffs with <n> lines of context instead of +

    Generate diffs with <n> lines of context instead of the usual three. Implies --patch.

    -
    --output=<file>
    +
    --output=<file>

    Output to a specific file instead of stdout.

    -
    --output-indicator-new=<char>
    -
    --output-indicator-old=<char>
    -
    --output-indicator-context=<char>
    +
    --output-indicator-new=<char>
    +
    --output-indicator-old=<char>
    +
    --output-indicator-context=<char>

    Specify the character used to indicate new, old or context -lines in the generated patch. Normally they are +, - and +lines in the generated patch. Normally they are +, - and ' ' respectively.

    -
    --raw
    +
    --raw

    Generate the diff in raw format. This is the default.

    -
    --patch-with-raw
    +
    --patch-with-raw

    Synonym for -p --raw.

    -
    --indent-heuristic
    +
    --indent-heuristic

    Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default.

    -
    --no-indent-heuristic
    +
    --no-indent-heuristic

    Disable the indent heuristic.

    -
    --minimal
    +
    --minimal

    Spend extra time to make sure the smallest possible diff is produced.

    -
    --patience
    +
    --patience

    Generate a diff using the "patience diff" algorithm.

    -
    --histogram
    +
    --histogram

    Generate a diff using the "histogram diff" algorithm.

    -
    --anchored=<text>
    +
    --anchored=<text>

    Generate a diff using the "anchored diff" algorithm.

    @@ -544,19 +544,20 @@ diff is produced.

    If a line exists in both the source and destination, exists only once, -and starts with this text, this algorithm attempts to prevent it from +and starts with <text>, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the "patience diff" algorithm internally.

    -
    --diff-algorithm={patience|minimal|histogram|myers}
    +
    --diff-algorithm=(patience|minimal|histogram|myers)

    Choose a diff algorithm. The variants are as follows:

    -
    default, myers
    +
    default
    +
    myers

    The basic greedy diff algorithm. Currently, this is the default.

    @@ -584,7 +585,7 @@ non-default value and want to use the default one, then you have to use --diff-algorithm=default option.

    -
    --stat[=<width>[,<name-width>[,<count>]]]
    +
    --stat[=<width>[,<name-width>[,<count>]]]

    Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph @@ -592,9 +593,9 @@ part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by giving another width <name-width> after a comma or by setting -diff.statNameWidth=<width>. The width of the graph part can be -limited by using --stat-graph-width=<width> or by setting -diff.statGraphWidth=<width>. Using --stat or +diff.statNameWidth=<name-width>. The width of the graph part can be +limited by using --stat-graph-width=<graph-width> or by setting +diff.statGraphWidth=<graph-width>. Using --stat or --stat-graph-width affects all commands generating a stat graph, while setting diff.statNameWidth or diff.statGraphWidth does not affect git format-patch. @@ -605,16 +606,16 @@ the first <count> lines, followed by ... if there are more.

    --stat-name-width=<name-width> and --stat-count=<count>.

    -
    --compact-summary
    +
    --compact-summary

    Output a condensed summary of extended header information such -as file creations or deletions ("new" or "gone", optionally "+l" -if it’s a symlink) and mode changes ("+x" or "-x" for adding +as file creations or deletions ("new" or "gone", optionally +l +if it’s a symlink) and mode changes (+x or -x for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies --stat.

    -
    --numstat
    +
    --numstat

    Similar to --stat, but shows number of added and deleted lines in decimal notation and pathname without @@ -622,14 +623,14 @@ abbreviation, to make it more machine friendly. For binary files, outputs two - instead of saying 0 0.

    -
    --shortstat
    +
    --shortstat

    Output only the last line of the --stat format containing total number of modified files, as well as number of added and deleted lines.

    -
    -X[<param1,param2,…​>]
    -
    --dirstat[=<param1,param2,…​>]
    +
    -X [<param>,...]
    +
    --dirstat[=<param>,...]

    Output the distribution of relative amount of changes for each sub-directory. The behavior of --dirstat can be customized by @@ -673,7 +674,7 @@ Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.

    -
    <limit>
    +
    <limit>

    An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes @@ -690,24 +691,24 @@ and accumulating child directory counts in the parent directories: --dirstat=files,10,cumulative.

    -
    --cumulative
    +
    --cumulative
    -

    Synonym for --dirstat=cumulative

    +

    Synonym for --dirstat=cumulative.

    -
    --dirstat-by-file[=<param1,param2>…​]
    +
    --dirstat-by-file[=<param>,...]
    -

    Synonym for --dirstat=files,<param1>,<param2>…​

    +

    Synonym for --dirstat=files,<param>,....

    -
    --summary
    +
    --summary

    Output a condensed summary of extended header information such as creations, renames and mode changes.

    -
    --patch-with-stat
    +
    --patch-with-stat

    Synonym for -p --stat.

    -
    -z
    +
    -z

    When --raw, --numstat, --name-only or --name-status has been given, do not munge pathnames and use NULs as output field terminators.

    @@ -717,88 +718,88 @@ explained for the configuration variable core.quotePath (see git-config(1)).

    -
    --name-only
    +
    --name-only

    Show only the name of each changed file in the post-image tree. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the git-log(1) manual page.

    -
    --name-status
    +
    --name-status

    Show only the name(s) and status of each changed file. See the description of the --diff-filter option on what the status letters mean. Just like --name-only the file names are often encoded in UTF-8.

    -
    --submodule[=<format>]
    +
    --submodule[=<format>]

    Specify how differences in submodules are shown. When specifying ---submodule=short the short format is used. This format just +--submodule=short the short format is used. This format just shows the names of the commits at the beginning and end of the range. -When --submodule or --submodule=log is specified, the log +When --submodule or --submodule=log is specified, the log format is used. This format lists the commits in the range like git-submodule(1) summary does. When --submodule=diff -is specified, the diff format is used. This format shows an +is specified, the diff format is used. This format shows an inline diff of the changes in the submodule contents between the -commit range. Defaults to diff.submodule or the short format +commit range. Defaults to diff.submodule or the short format if the config option is unset.

    -
    --color[=<when>]
    +
    --color[=<when>]

    Show colored diff. ---color (i.e. without =<when>) is the same as --color=always. +--color (i.e. without =<when>) is the same as --color=always. <when> can be one of always, never, or auto.

    -
    --no-color
    +
    --no-color

    Turn off colored diff. It is the same as --color=never.

    -
    --color-moved[=<mode>]
    +
    --color-moved[=<mode>]

    Moved lines of code are colored differently. -The <mode> defaults to no if the option is not given -and to zebra if the option with no mode is given. +The <mode> defaults to no if the option is not given +and to zebra if the option with no mode is given. The mode must be one of:

    -
    no
    +
    no

    Moved lines are not highlighted.

    -
    default
    +
    default

    Is a synonym for zebra. This may change to a more sensible mode in the future.

    -
    plain
    +
    plain

    Any line that is added in one location and was removed -in another location will be colored with color.diff.newMoved. -Similarly color.diff.oldMoved will be used for removed lines +in another location will be colored with color.diff.newMoved. +Similarly color.diff.oldMoved will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation.

    -
    blocks
    +
    blocks

    Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are -painted using either the color.diff.{old,new}Moved color. +painted using either the color.diff.(old|new)Moved color. Adjacent blocks cannot be told apart.

    -
    zebra
    +
    zebra
    -

    Blocks of moved text are detected as in blocks mode. The blocks -are painted using either the color.diff.{old,new}Moved color or -color.diff.{old,new}MovedAlternative. The change between +

    Blocks of moved text are detected as in blocks mode. The blocks +are painted using either the color.diff.(old|new)Moved color or +color.diff.(old|new)MovedAlternative. The change between the two colors indicates that a new block was detected.

    -
    dimmed-zebra
    +
    dimmed-zebra
    -

    Similar to zebra, but additional dimming of uninteresting parts +

    Similar to zebra, but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. dimmed_zebra is a deprecated synonym.

    @@ -808,12 +809,12 @@ blocks are considered interesting, the rest is uninteresting.
    -
    --no-color-moved
    +
    --no-color-moved

    Turn off move detection. This can be used to override configuration settings. It is the same as --color-moved=no.

    -
    --color-moved-ws=<modes>
    +
    --color-moved-ws=<mode>,...

    This configures how whitespace is ignored when performing the move detection for --color-moved. @@ -822,26 +823,26 @@ These modes can be given as a comma separated list:

    -
    no
    +
    no

    Do not ignore whitespace when performing move detection.

    -
    ignore-space-at-eol
    +
    ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    ignore-space-change
    +
    ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    ignore-all-space
    +
    ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    allow-indentation-change
    +
    allow-indentation-change

    Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in @@ -853,33 +854,32 @@ other modes.

    -
    --no-color-moved-ws
    +
    --no-color-moved-ws

    Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as --color-moved-ws=no.

    -
    --word-diff[=<mode>]
    +
    --word-diff[=<mode>]
    -

    Show a word diff, using the <mode> to delimit changed words. -By default, words are delimited by whitespace; see ---word-diff-regex below. The <mode> defaults to plain, and +

    By default, words are delimited by whitespace; see +--word-diff-regex below. The <mode> defaults to plain, and must be one of:

    -
    color
    +
    color

    Highlight changed words using only colors. Implies --color.

    -
    plain
    +
    plain
    -

    Show words as [-removed-] and {+added+}. Makes no +

    Show words as [-removed-] and {added}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.

    -
    porcelain
    +
    porcelain

    Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the @@ -888,7 +888,7 @@ character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde ~ on a line of its own.

    -
    none
    +
    none

    Disable word diff again.

    @@ -901,14 +901,14 @@ tilde ~ on a line of its own.

    highlight the changed parts in all modes if enabled.

    -
    --word-diff-regex=<regex>
    +
    --word-diff-regex=<regex>
    -

    Use <regex> to decide what a word is, instead of considering +

    Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies --word-diff unless it was already enabled.

    Every non-overlapping match of the -<regex> is considered a word. Anything between these matches is +<regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append |[^[:space:]] to your regular expression to make sure that it matches all non-whitespace characters. @@ -926,21 +926,21 @@ overrides any diff driver or configuration setting. Diff drivers override configuration settings.

    -
    --color-words[=<regex>]
    +
    --color-words[=<regex>]

    Equivalent to --word-diff=color plus (if a regex was specified) --word-diff-regex=<regex>.

    -
    --no-renames
    +
    --no-renames

    Turn off rename detection, even when the configuration file gives the default to do so.

    -
    --[no-]rename-empty
    +
    --[no-]rename-empty

    Whether to use empty blobs as rename source.

    -
    --check
    +
    --check

    Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by core.whitespace @@ -949,9 +949,9 @@ lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible -with --exit-code.

    +with --exit-code.

    -
    --ws-error-highlight=<kind>
    +
    --ws-error-highlight=<kind>

    Highlight whitespace errors in the context, old or new lines of the diff. Multiple values are separated by comma, @@ -962,19 +962,19 @@ this option is not given, and the configuration variable new lines are highlighted. The whitespace errors are colored with color.diff.whitespace.

    -
    --full-index
    +
    --full-index

    Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output.

    -
    --binary
    +
    --binary

    In addition to --full-index, output a binary diff that can be applied with git-apply. Implies --patch.

    -
    --abbrev[=<n>]
    +
    --abbrev[=<n>]

    Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header @@ -985,8 +985,8 @@ precedence, i.e. if --full-index is specified, full blob names will be shown regardless of --abbrev. Non default number of digits can be specified with --abbrev=<n>.

    -
    -B[<n>][/<m>]
    -
    --break-rewrites[=[<n>][/<m>]]
    +
    -B[<n>][/<m>]
    +
    --break-rewrites[=[<n>][/<m>]]

    Break complete rewrite changes into pairs of delete and create. This serves two purposes:

    @@ -995,27 +995,27 @@ create. This serves two purposes:

    not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of -everything new, and the number m controls this aspect of the -B +everything new, and the number <m> controls this aspect of the -B option (defaults to 60%). -B/70% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).

    • -

    When used with -M, a totally-rewritten file is also considered as the -source of a rename (usually -M only considers a file that disappeared -as the source of a rename), and the number n controls this aspect of -the -B option (defaults to 50%). -B20% specifies that a change with +

    When used with -M, a totally-rewritten file is also considered as the +source of a rename (usually -M only considers a file that disappeared +as the source of a rename), and the number <n> controls this aspect of +the -B option (defaults to 50%). -B20% specifies that a change with addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.

    -
    -M[<n>]
    -
    --find-renames[=<n>]
    +
    -M[<n>]
    +
    --find-renames[=<n>]

    Detect renames. -If n is specified, it is a threshold on the similarity +If <n> is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file’s size). For example, -M90% means Git should consider a delete/add pair to be a rename if more than 90% of the file @@ -1025,13 +1025,13 @@ a fraction, with a decimal point before it. I.e., -M5 becomes the same as -M5%. To limit detection to exact renames, use -M100%. The default similarity index is 50%.

    -
    -C[<n>]
    -
    --find-copies[=<n>]
    +
    -C[<n>]
    +
    --find-copies[=<n>]

    Detect copies as well as renames. See also --find-copies-harder. -If n is specified, it has the same meaning as for -M<n>.

    +If <n> is specified, it has the same meaning as for -M<n>.

    -
    --find-copies-harder
    +
    --find-copies-harder

    For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same @@ -1041,8 +1041,8 @@ copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one -C option has the same effect.

    -
    -D
    -
    --irreversible-delete
    +
    -D
    +
    --irreversible-delete

    Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and /dev/null. The resulting patch @@ -1056,7 +1056,7 @@ hence the name of the option.

    of a delete/create pair.

    -
    -l<num>
    +
    -l<num>

    The -M and -C options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an @@ -1067,10 +1067,10 @@ original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved -exceeds the specified number. Defaults to diff.renameLimit. +exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited.

    -
    --diff-filter=[(A|C|D|M|R|T|U|X|B)…​[*]]
    +
    --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]

    Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their @@ -1091,10 +1091,10 @@ that matches other criteria, nothing is selected.

    renamed entries cannot appear if detection for those types is disabled.

    -
    -S<string>
    +
    -S<string>

    Look for differences that change the number of occurrences of -the specified string (i.e. addition/deletion) in a file. +the specified <string> (i.e. addition/deletion) in a file. Intended for the scripter’s use.

    It is useful when you’re looking for an exact block of code (like a @@ -1107,10 +1107,10 @@ very first version of the block.

    Binary files are searched as well.

    -
    -G<regex>
    +
    -G<regex>

    Look for differences whose patch text contains added/removed -lines that match <regex>.

    +lines that match <regex>.

    To illustrate the difference between -S<regex> --pickaxe-regex and -G<regex>, consider a commit with the following diff in the same @@ -1137,7 +1137,7 @@ filter will be ignored.

    information.

    -
    --find-object=<object-id>
    +
    --find-object=<object-id>

    Look for differences that change the number of occurrences of the specified object. Similar to -S, just the argument is different @@ -1148,18 +1148,18 @@ object id.

    git-log to also find trees.

    -
    --pickaxe-all
    +
    --pickaxe-all

    When -S or -G finds a change, show all the changes in that changeset, not just the files that contain the change -in <string>.

    +in <string>.

    -
    --pickaxe-regex
    +
    --pickaxe-regex
    -

    Treat the <string> given to -S as an extended POSIX regular +

    Treat the <string> given to -S as an extended POSIX regular expression to match.

    -
    -O<orderfile>
    +
    -O<orderfile>

    Control the order in which files appear in the output. This overrides the diff.orderFile configuration variable @@ -1167,7 +1167,7 @@ This overrides the diff.orderFile configuration variable use -O/dev/null.

    The output order is determined by the order of glob patterns in -<orderfile>. +<orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. @@ -1179,7 +1179,7 @@ but no earlier patterns), their output order relative to each other is the normal order.

    -

    <orderfile> is parsed as follows:

    +

    <orderfile> is parsed as follows:

    @@ -1203,117 +1203,117 @@ pattern if it starts with a hash.

    Patterns have the same syntax and semantics as patterns used for -fnmatch(3) without the FNM_PATHNAME flag, except a pathname also +fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "foo*bar" matches "fooasdfbar" and "foo/bar/baz/asdf" but not "foobarx".

    -
    --skip-to=<file>
    -
    --rotate-to=<file>
    +
    --skip-to=<file>
    +
    --rotate-to=<file>
    -

    Discard the files before the named <file> from the output +

    Discard the files before the named <file> from the output (i.e. skip to), or move them to the end of the output (i.e. rotate to). These options were invented primarily for the use of the git difftool command, and may not be very useful otherwise.

    -
    -R
    +
    -R

    Swap two inputs; that is, show differences from index or on-disk file to tree contents.

    -
    --relative[=<path>]
    -
    --no-relative
    +
    --relative[=<path>]
    +
    --no-relative

    When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative -to by giving a <path> as an argument. +to by giving a <path> as an argument. --no-relative can be used to countermand both diff.relative config option and previous --relative.

    -
    -a
    -
    --text
    +
    -a
    +
    --text

    Treat all files as text.

    -
    --ignore-cr-at-eol
    +
    --ignore-cr-at-eol

    Ignore carriage-return at the end of line when doing a comparison.

    -
    --ignore-space-at-eol
    +
    --ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    -b
    -
    --ignore-space-change
    +
    -b
    +
    --ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    -w
    -
    --ignore-all-space
    +
    -w
    +
    --ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    --ignore-blank-lines
    +
    --ignore-blank-lines

    Ignore changes whose lines are all blank.

    -
    -I<regex>
    -
    --ignore-matching-lines=<regex>
    +
    -I<regex>
    +
    --ignore-matching-lines=<regex>
    -

    Ignore changes whose all lines match <regex>. This option may +

    Ignore changes whose all lines match <regex>. This option may be specified more than once.

    -
    --inter-hunk-context=<lines>
    +
    --inter-hunk-context=<number>
    -

    Show the context between diff hunks, up to the specified number +

    Show the context between diff hunks, up to the specified <number> of lines, thereby fusing hunks that are close to each other. Defaults to diff.interHunkContext or 0 if the config option is unset.

    -
    -W
    -
    --function-context
    +
    -W
    +
    --function-context

    Show whole function as context lines for each change. The function names are determined in the same way as -git diff works out patch hunk headers (see Defining a -custom hunk-header in gitattributes(5)).

    +git diff works out patch hunk headers (see "Defining a +custom hunk-header" in gitattributes(5)).

    -
    --exit-code
    +
    --exit-code
    -

    Make the program exit with codes similar to diff(1). +

    Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences.

    -
    --quiet
    +
    --quiet

    Disable all output of the program. Implies --exit-code. Disables execution of external diff helpers whose exit code is not trusted, i.e. their respective configuration option -diff.trustExitCode or diff.<driver>.trustExitCode or +diff.trustExitCode or diff.<driver>.trustExitCode or environment variable GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE is false.

    -
    --ext-diff
    +
    --ext-diff

    Allow an external diff helper to be executed. If you set an external diff driver with gitattributes(5), you need to use this option with git-log(1) and friends.

    -
    --no-ext-diff
    +
    --no-ext-diff

    Disallow external diff drivers.

    -
    --textconv
    -
    --no-textconv
    +
    --textconv
    +
    --no-textconv

    Allow (or disallow) external text conversion filters to be run when comparing binary files. See gitattributes(5) for @@ -1324,49 +1324,48 @@ filters are enabled by default only for git-diff(1) git-log(1), but not for git-format-patch(1) or diff plumbing commands.

    -
    --ignore-submodules[=<when>]
    +
    --ignore-submodules[=(none|untracked|dirty|all)]
    -

    Ignore changes to submodules in the diff generation. <when> can be -either "none", "untracked", "dirty" or "all", which is the default. -Using "none" will consider the submodule modified when it either contains -untracked or modified files or its HEAD differs from the commit recorded +

    Ignore changes to submodules in the diff generation. all is the default. +Using none will consider the submodule modified when it either contains +untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the -ignore option in git-config(1) or gitmodules(5). When -"untracked" is used submodules are not considered dirty when they only +ignore option in git-config(1) or gitmodules(5). When +untracked is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified -content). Using "dirty" ignores all changes to the work tree of submodules, +content). Using dirty ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was -the behavior until 1.7.0). Using "all" hides all changes to submodules.

    +the behavior until 1.7.0). Using all hides all changes to submodules.

    -
    --src-prefix=<prefix>
    +
    --src-prefix=<prefix>
    -

    Show the given source prefix instead of "a/".

    +

    Show the given source <prefix> instead of "a/".

    -
    --dst-prefix=<prefix>
    +
    --dst-prefix=<prefix>
    -

    Show the given destination prefix instead of "b/".

    +

    Show the given destination <prefix> instead of "b/".

    -
    --no-prefix
    +
    --no-prefix

    Do not show any source or destination prefix.

    -
    --default-prefix
    +
    --default-prefix

    Use the default source and destination prefixes ("a/" and "b/"). This overrides configuration variables such as diff.noprefix, diff.srcPrefix, diff.dstPrefix, and diff.mnemonicPrefix -(see git-config(1)).

    +(see git-config(1)).

    -
    --line-prefix=<prefix>
    +
    --line-prefix=<prefix>
    -

    Prepend an additional prefix to every line of output.

    +

    Prepend an additional <prefix> to every line of output.

    -
    --ita-invisible-in-index
    +
    --ita-invisible-in-index
    -

    By default entries added by "git add -N" appear as an existing -empty file in "git diff" and a new file in "git diff --cached". -This option makes the entry appear as a new file in "git diff" -and non-existent in "git diff --cached". This option could be +

    By default entries added by git add -N appear as an existing +empty file in git diff and a new file in git diff --cached. +This option makes the entry appear as a new file in git diff +and non-existent in git diff --cached. This option could be reverted with --ita-visible-in-index. Both options are experimental and could be removed in future.

    @@ -1407,8 +1406,8 @@ to date.

    Raw output format

    -

    The raw output format from "git-diff-index", "git-diff-tree", -"git-diff-files" and "git diff --raw" are very similar.

    +

    The raw output format from git-diff-index, git-diff-tree, +git-diff-files and git diff --raw are very similar.

    These commands all compare two sets of things; what is @@ -1416,26 +1415,26 @@ compared differs:

    -
    git-diff-index <tree-ish>
    +
    git-diff-index <tree-ish>
    -

    compares the <tree-ish> and the files on the filesystem.

    +

    compares the <tree-ish> and the files on the filesystem.

    -
    git-diff-index --cached <tree-ish>
    +
    git-diff-index --cached <tree-ish>
    -

    compares the <tree-ish> and the index.

    +

    compares the <tree-ish> and the index.

    -
    git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…​]
    +
    git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]

    compares the trees named by the two arguments.

    -
    git-diff-files [<pattern>…​]
    +
    git-diff-files [<pattern>...]

    compares the index and the files on the filesystem.

    -

    The "git-diff-tree" command begins its output by printing the hash of +

    The git-diff-tree command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file.

    @@ -1510,36 +1509,36 @@ unmerged :000000 000000 0000000 0000000 U file6
    • -

      A: addition of a file

      +

      A: addition of a file

    • -

      C: copy of a file into a new one

      +

      C: copy of a file into a new one

    • -

      D: deletion of a file

      +

      D: deletion of a file

    • -

      M: modification of the contents or mode of a file

      +

      M: modification of the contents or mode of a file

    • -

      R: renaming of a file

      +

      R: renaming of a file

    • -

      T: change in the type of the file (regular file, symbolic link or submodule)

      +

      T: change in the type of the file (regular file, symbolic link or submodule)

    • -

      U: file is unmerged (you must complete the merge before it can +

      U: file is unmerged (you must complete the merge before it can be committed)

    • -

      X: "unknown" change type (most probably a bug, please report it)

      +

      X: "unknown" change type (most probably a bug, please report it)

    -

    Status letters C and R are always followed by a score (denoting the +

    Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or -copy). Status letter M may be followed by a score (denoting the +copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites.

    @@ -1566,7 +1565,7 @@ verbatim and the line is terminated by a NUL byte.

    diff format for merges

    -

    "git-diff-tree", "git-diff-files" and "git-diff --raw" +

    git-diff-tree, git-diff-files and git-diff --raw can take -c or --cc option to generate diff output also for merge commits. The output differs from the format described above in the following way:

    @@ -1639,7 +1638,7 @@ You can customize the creation of patch text via the (see git(1)), and the diff attribute (see gitattributes(5)).

    -

    What the -p option produces is slightly different from the traditional +

    What the -p option produces is slightly different from the traditional diff format:

    @@ -1664,23 +1663,21 @@ the file that the rename/copy produces, respectively.

  • It is followed by one or more extended header lines:

    -
    -
    -
    old mode <mode>
-new mode <mode>
-deleted file mode <mode>
-new file mode <mode>
-copy from <path>
-copy to <path>
-rename from <path>
-rename to <path>
-similarity index <number>
-dissimilarity index <number>
-index <hash>..<hash> <mode>
    -
    -
    -
    -

    File modes are printed as 6-digit octal numbers including the file type +

    +
    old mode <mode>
+new mode <mode>
+deleted file mode <mode>
+new file mode <mode>
+copy from <path>
+copy to <path>
+rename from <path>
+rename to <path>
+similarity index <number>
+dissimilarity index <number>
+index <hash>`..`<hash> <mode>
    +
    +
    +

    File modes <mode> are printed as 6-digit octal numbers including the file type and file permission bits.

    @@ -1696,7 +1693,7 @@ file made it into the new one.

    The index line includes the blob object names before and after the change. -The <mode> is included if the file mode does not change; otherwise, +The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode.

    • @@ -1798,20 +1795,18 @@ this (when the -c option is used):

  • It is followed by one or more extended header lines (this example shows a merge with two parents):

    -
    -
    -
    index <hash>,<hash>..<hash>
-mode <mode>,<mode>..<mode>
-new file mode <mode>
-deleted file mode <mode>,<mode>
    -
    +
    +
    index <hash>,<hash>`..__<hash>__
+{empty}`mode <mode>,<mode>``..``<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>

    The mode <mode>,<mode>..<mode> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two -<tree-ish> and are not used by combined diff format.

    +<tree-ish> and are not used by combined diff format.

  • @@ -1902,7 +1897,7 @@ two unresolved merge parents with the working tree file

    The --summary option describes newly added, deleted, renamed and -copied files. The --stat option adds diffstat(1) graph to the +copied files. The --stat option adds diffstat(1) graph to the output. These options can be combined with other options, such as -p, and are meant for human consumption.

    @@ -2151,7 +2146,7 @@ always have the special all-zero sha1.
    diff --git a/git-diff-tree.html b/git-diff-tree.html index 44b53134..fc0b5d46 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -477,71 +477,71 @@ pre>code {
    -
    -p
    -
    -u
    -
    --patch
    +
    -p
    +
    -u
    +
    --patch

    Generate patch (see Generating patch text with -p).

    -
    -s
    -
    --no-patch
    +
    -s
    +
    --no-patch

    Suppress all output from the diff machinery. Useful for commands like git show that show the patch by default to squelch their output, or to cancel the effect of options like --patch, --stat earlier on the command line in an alias.

    -
    -U<n>
    -
    --unified=<n>
    +
    -U<n>
    +
    --unified=<n>
    -

    Generate diffs with <n> lines of context instead of +

    Generate diffs with <n> lines of context instead of the usual three. Implies --patch.

    -
    --output=<file>
    +
    --output=<file>

    Output to a specific file instead of stdout.

    -
    --output-indicator-new=<char>
    -
    --output-indicator-old=<char>
    -
    --output-indicator-context=<char>
    +
    --output-indicator-new=<char>
    +
    --output-indicator-old=<char>
    +
    --output-indicator-context=<char>

    Specify the character used to indicate new, old or context -lines in the generated patch. Normally they are +, - and +lines in the generated patch. Normally they are +, - and ' ' respectively.

    -
    --raw
    +
    --raw

    Generate the diff in raw format. This is the default.

    -
    --patch-with-raw
    +
    --patch-with-raw

    Synonym for -p --raw.

    -
    --indent-heuristic
    +
    --indent-heuristic

    Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default.

    -
    --no-indent-heuristic
    +
    --no-indent-heuristic

    Disable the indent heuristic.

    -
    --minimal
    +
    --minimal

    Spend extra time to make sure the smallest possible diff is produced.

    -
    --patience
    +
    --patience

    Generate a diff using the "patience diff" algorithm.

    -
    --histogram
    +
    --histogram

    Generate a diff using the "histogram diff" algorithm.

    -
    --anchored=<text>
    +
    --anchored=<text>

    Generate a diff using the "anchored diff" algorithm.

    @@ -549,19 +549,20 @@ diff is produced.

    If a line exists in both the source and destination, exists only once, -and starts with this text, this algorithm attempts to prevent it from +and starts with <text>, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the "patience diff" algorithm internally.

    -
    --diff-algorithm={patience|minimal|histogram|myers}
    +
    --diff-algorithm=(patience|minimal|histogram|myers)

    Choose a diff algorithm. The variants are as follows:

    -
    default, myers
    +
    default
    +
    myers

    The basic greedy diff algorithm. Currently, this is the default.

    @@ -589,7 +590,7 @@ non-default value and want to use the default one, then you have to use --diff-algorithm=default option.

    -
    --stat[=<width>[,<name-width>[,<count>]]]
    +
    --stat[=<width>[,<name-width>[,<count>]]]

    Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph @@ -597,9 +598,9 @@ part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by giving another width <name-width> after a comma or by setting -diff.statNameWidth=<width>. The width of the graph part can be -limited by using --stat-graph-width=<width> or by setting -diff.statGraphWidth=<width>. Using --stat or +diff.statNameWidth=<name-width>. The width of the graph part can be +limited by using --stat-graph-width=<graph-width> or by setting +diff.statGraphWidth=<graph-width>. Using --stat or --stat-graph-width affects all commands generating a stat graph, while setting diff.statNameWidth or diff.statGraphWidth does not affect git format-patch. @@ -610,16 +611,16 @@ the first <count> lines, followed by ... if there are more.

    --stat-name-width=<name-width> and --stat-count=<count>.

    -
    --compact-summary
    +
    --compact-summary

    Output a condensed summary of extended header information such -as file creations or deletions ("new" or "gone", optionally "+l" -if it’s a symlink) and mode changes ("+x" or "-x" for adding +as file creations or deletions ("new" or "gone", optionally +l +if it’s a symlink) and mode changes (+x or -x for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies --stat.

    -
    --numstat
    +
    --numstat

    Similar to --stat, but shows number of added and deleted lines in decimal notation and pathname without @@ -627,14 +628,14 @@ abbreviation, to make it more machine friendly. For binary files, outputs two - instead of saying 0 0.

    -
    --shortstat
    +
    --shortstat

    Output only the last line of the --stat format containing total number of modified files, as well as number of added and deleted lines.

    -
    -X[<param1,param2,…​>]
    -
    --dirstat[=<param1,param2,…​>]
    +
    -X [<param>,...]
    +
    --dirstat[=<param>,...]

    Output the distribution of relative amount of changes for each sub-directory. The behavior of --dirstat can be customized by @@ -678,7 +679,7 @@ Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.

    -
    <limit>
    +
    <limit>

    An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes @@ -695,24 +696,24 @@ and accumulating child directory counts in the parent directories: --dirstat=files,10,cumulative.

    -
    --cumulative
    +
    --cumulative
    -

    Synonym for --dirstat=cumulative

    +

    Synonym for --dirstat=cumulative.

    -
    --dirstat-by-file[=<param1,param2>…​]
    +
    --dirstat-by-file[=<param>,...]
    -

    Synonym for --dirstat=files,<param1>,<param2>…​

    +

    Synonym for --dirstat=files,<param>,....

    -
    --summary
    +
    --summary

    Output a condensed summary of extended header information such as creations, renames and mode changes.

    -
    --patch-with-stat
    +
    --patch-with-stat

    Synonym for -p --stat.

    -
    -z
    +
    -z

    When --raw, --numstat, --name-only or --name-status has been given, do not munge pathnames and use NULs as output field terminators.

    @@ -722,88 +723,88 @@ explained for the configuration variable core.quotePath (see git-config(1)).

    • -
    --name-only
    +
    --name-only

    Show only the name of each changed file in the post-image tree. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the git-log(1) manual page.

    -
    --name-status
    +
    --name-status

    Show only the name(s) and status of each changed file. See the description of the --diff-filter option on what the status letters mean. Just like --name-only the file names are often encoded in UTF-8.

    -
    --submodule[=<format>]
    +
    --submodule[=<format>]

    Specify how differences in submodules are shown. When specifying ---submodule=short the short format is used. This format just +--submodule=short the short format is used. This format just shows the names of the commits at the beginning and end of the range. -When --submodule or --submodule=log is specified, the log +When --submodule or --submodule=log is specified, the log format is used. This format lists the commits in the range like git-submodule(1) summary does. When --submodule=diff -is specified, the diff format is used. This format shows an +is specified, the diff format is used. This format shows an inline diff of the changes in the submodule contents between the -commit range. Defaults to diff.submodule or the short format +commit range. Defaults to diff.submodule or the short format if the config option is unset.

    -
    --color[=<when>]
    +
    --color[=<when>]

    Show colored diff. ---color (i.e. without =<when>) is the same as --color=always. +--color (i.e. without =<when>) is the same as --color=always. <when> can be one of always, never, or auto.

    -
    --no-color
    +
    --no-color

    Turn off colored diff. It is the same as --color=never.

    -
    --color-moved[=<mode>]
    +
    --color-moved[=<mode>]

    Moved lines of code are colored differently. -The <mode> defaults to no if the option is not given -and to zebra if the option with no mode is given. +The <mode> defaults to no if the option is not given +and to zebra if the option with no mode is given. The mode must be one of:

    -
    no
    +
    no

    Moved lines are not highlighted.

    -
    default
    +
    default

    Is a synonym for zebra. This may change to a more sensible mode in the future.

    -
    plain
    +
    plain

    Any line that is added in one location and was removed -in another location will be colored with color.diff.newMoved. -Similarly color.diff.oldMoved will be used for removed lines +in another location will be colored with color.diff.newMoved. +Similarly color.diff.oldMoved will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation.

    -
    blocks
    +
    blocks

    Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are -painted using either the color.diff.{old,new}Moved color. +painted using either the color.diff.(old|new)Moved color. Adjacent blocks cannot be told apart.

    -
    zebra
    +
    zebra
    -

    Blocks of moved text are detected as in blocks mode. The blocks -are painted using either the color.diff.{old,new}Moved color or -color.diff.{old,new}MovedAlternative. The change between +

    Blocks of moved text are detected as in blocks mode. The blocks +are painted using either the color.diff.(old|new)Moved color or +color.diff.(old|new)MovedAlternative. The change between the two colors indicates that a new block was detected.

    -
    dimmed-zebra
    +
    dimmed-zebra
    -

    Similar to zebra, but additional dimming of uninteresting parts +

    Similar to zebra, but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. dimmed_zebra is a deprecated synonym.

    @@ -813,12 +814,12 @@ blocks are considered interesting, the rest is uninteresting.
    -
    --no-color-moved
    +
    --no-color-moved

    Turn off move detection. This can be used to override configuration settings. It is the same as --color-moved=no.

    -
    --color-moved-ws=<modes>
    +
    --color-moved-ws=<mode>,...

    This configures how whitespace is ignored when performing the move detection for --color-moved. @@ -827,26 +828,26 @@ These modes can be given as a comma separated list:

    -
    no
    +
    no

    Do not ignore whitespace when performing move detection.

    -
    ignore-space-at-eol
    +
    ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    ignore-space-change
    +
    ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    ignore-all-space
    +
    ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    allow-indentation-change
    +
    allow-indentation-change

    Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in @@ -858,33 +859,32 @@ other modes.

    -
    --no-color-moved-ws
    +
    --no-color-moved-ws

    Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as --color-moved-ws=no.

    -
    --word-diff[=<mode>]
    +
    --word-diff[=<mode>]
    -

    Show a word diff, using the <mode> to delimit changed words. -By default, words are delimited by whitespace; see ---word-diff-regex below. The <mode> defaults to plain, and +

    By default, words are delimited by whitespace; see +--word-diff-regex below. The <mode> defaults to plain, and must be one of:

    -
    color
    +
    color

    Highlight changed words using only colors. Implies --color.

    -
    plain
    +
    plain
    -

    Show words as [-removed-] and {+added+}. Makes no +

    Show words as [-removed-] and {added}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.

    -
    porcelain
    +
    porcelain

    Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the @@ -893,7 +893,7 @@ character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde ~ on a line of its own.

    -
    none
    +
    none

    Disable word diff again.

    @@ -906,14 +906,14 @@ tilde ~ on a line of its own.

    highlight the changed parts in all modes if enabled.

    -
    --word-diff-regex=<regex>
    +
    --word-diff-regex=<regex>
    -

    Use <regex> to decide what a word is, instead of considering +

    Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies --word-diff unless it was already enabled.

    Every non-overlapping match of the -<regex> is considered a word. Anything between these matches is +<regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append |[^[:space:]] to your regular expression to make sure that it matches all non-whitespace characters. @@ -931,21 +931,21 @@ overrides any diff driver or configuration setting. Diff drivers override configuration settings.

    -
    --color-words[=<regex>]
    +
    --color-words[=<regex>]

    Equivalent to --word-diff=color plus (if a regex was specified) --word-diff-regex=<regex>.

    -
    --no-renames
    +
    --no-renames

    Turn off rename detection, even when the configuration file gives the default to do so.

    -
    --[no-]rename-empty
    +
    --[no-]rename-empty

    Whether to use empty blobs as rename source.

    -
    --check
    +
    --check

    Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by core.whitespace @@ -954,9 +954,9 @@ lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible -with --exit-code.

    +with --exit-code.

    -
    --ws-error-highlight=<kind>
    +
    --ws-error-highlight=<kind>

    Highlight whitespace errors in the context, old or new lines of the diff. Multiple values are separated by comma, @@ -967,19 +967,19 @@ this option is not given, and the configuration variable new lines are highlighted. The whitespace errors are colored with color.diff.whitespace.

    -
    --full-index
    +
    --full-index

    Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output.

    -
    --binary
    +
    --binary

    In addition to --full-index, output a binary diff that can be applied with git-apply. Implies --patch.

    -
    --abbrev[=<n>]
    +
    --abbrev[=<n>]

    Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header @@ -990,8 +990,8 @@ precedence, i.e. if --full-index is specified, full blob names will be shown regardless of --abbrev. Non default number of digits can be specified with --abbrev=<n>.

    -
    -B[<n>][/<m>]
    -
    --break-rewrites[=[<n>][/<m>]]
    +
    -B[<n>][/<m>]
    +
    --break-rewrites[=[<n>][/<m>]]

    Break complete rewrite changes into pairs of delete and create. This serves two purposes:

    @@ -1000,27 +1000,27 @@ create. This serves two purposes:

    not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of -everything new, and the number m controls this aspect of the -B +everything new, and the number <m> controls this aspect of the -B option (defaults to 60%). -B/70% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).

    -

    When used with -M, a totally-rewritten file is also considered as the -source of a rename (usually -M only considers a file that disappeared -as the source of a rename), and the number n controls this aspect of -the -B option (defaults to 50%). -B20% specifies that a change with +

    When used with -M, a totally-rewritten file is also considered as the +source of a rename (usually -M only considers a file that disappeared +as the source of a rename), and the number <n> controls this aspect of +the -B option (defaults to 50%). -B20% specifies that a change with addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.

    -
    -M[<n>]
    -
    --find-renames[=<n>]
    +
    -M[<n>]
    +
    --find-renames[=<n>]

    Detect renames. -If n is specified, it is a threshold on the similarity +If <n> is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file’s size). For example, -M90% means Git should consider a delete/add pair to be a rename if more than 90% of the file @@ -1030,13 +1030,13 @@ a fraction, with a decimal point before it. I.e., -M5 becomes the same as -M5%. To limit detection to exact renames, use -M100%. The default similarity index is 50%.

    -
    -C[<n>]
    -
    --find-copies[=<n>]
    +
    -C[<n>]
    +
    --find-copies[=<n>]

    Detect copies as well as renames. See also --find-copies-harder. -If n is specified, it has the same meaning as for -M<n>.

    +If <n> is specified, it has the same meaning as for -M<n>.

    -
    --find-copies-harder
    +
    --find-copies-harder

    For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same @@ -1046,8 +1046,8 @@ copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one -C option has the same effect.

    -
    -D
    -
    --irreversible-delete
    +
    -D
    +
    --irreversible-delete

    Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and /dev/null. The resulting patch @@ -1061,7 +1061,7 @@ hence the name of the option.

    of a delete/create pair.

    -
    -l<num>
    +
    -l<num>

    The -M and -C options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an @@ -1072,10 +1072,10 @@ original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved -exceeds the specified number. Defaults to diff.renameLimit. +exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited.

    -
    --diff-filter=[(A|C|D|M|R|T|U|X|B)…​[*]]
    +
    --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]

    Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their @@ -1096,10 +1096,10 @@ that matches other criteria, nothing is selected.

    renamed entries cannot appear if detection for those types is disabled.

    -
    -S<string>
    +
    -S<string>

    Look for differences that change the number of occurrences of -the specified string (i.e. addition/deletion) in a file. +the specified <string> (i.e. addition/deletion) in a file. Intended for the scripter’s use.

    It is useful when you’re looking for an exact block of code (like a @@ -1112,10 +1112,10 @@ very first version of the block.

    Binary files are searched as well.

    -
    -G<regex>
    +
    -G<regex>

    Look for differences whose patch text contains added/removed -lines that match <regex>.

    +lines that match <regex>.

    To illustrate the difference between -S<regex> --pickaxe-regex and -G<regex>, consider a commit with the following diff in the same @@ -1142,7 +1142,7 @@ filter will be ignored.

    information.

    -
    --find-object=<object-id>
    +
    --find-object=<object-id>

    Look for differences that change the number of occurrences of the specified object. Similar to -S, just the argument is different @@ -1153,18 +1153,18 @@ object id.

    git-log to also find trees.

    -
    --pickaxe-all
    +
    --pickaxe-all

    When -S or -G finds a change, show all the changes in that changeset, not just the files that contain the change -in <string>.

    +in <string>.

    -
    --pickaxe-regex
    +
    --pickaxe-regex
    -

    Treat the <string> given to -S as an extended POSIX regular +

    Treat the <string> given to -S as an extended POSIX regular expression to match.

    -
    -O<orderfile>
    +
    -O<orderfile>

    Control the order in which files appear in the output. This overrides the diff.orderFile configuration variable @@ -1172,7 +1172,7 @@ This overrides the diff.orderFile configuration variable use -O/dev/null.

    The output order is determined by the order of glob patterns in -<orderfile>. +<orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. @@ -1184,7 +1184,7 @@ but no earlier patterns), their output order relative to each other is the normal order.

    -

    <orderfile> is parsed as follows:

    +

    <orderfile> is parsed as follows:

    @@ -1208,117 +1208,117 @@ pattern if it starts with a hash.

    Patterns have the same syntax and semantics as patterns used for -fnmatch(3) without the FNM_PATHNAME flag, except a pathname also +fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "foo*bar" matches "fooasdfbar" and "foo/bar/baz/asdf" but not "foobarx".

    -
    --skip-to=<file>
    -
    --rotate-to=<file>
    +
    --skip-to=<file>
    +
    --rotate-to=<file>
    -

    Discard the files before the named <file> from the output +

    Discard the files before the named <file> from the output (i.e. skip to), or move them to the end of the output (i.e. rotate to). These options were invented primarily for the use of the git difftool command, and may not be very useful otherwise.

    -
    -R
    +
    -R

    Swap two inputs; that is, show differences from index or on-disk file to tree contents.

    -
    --relative[=<path>]
    -
    --no-relative
    +
    --relative[=<path>]
    +
    --no-relative

    When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative -to by giving a <path> as an argument. +to by giving a <path> as an argument. --no-relative can be used to countermand both diff.relative config option and previous --relative.

    -
    -a
    -
    --text
    +
    -a
    +
    --text

    Treat all files as text.

    -
    --ignore-cr-at-eol
    +
    --ignore-cr-at-eol

    Ignore carriage-return at the end of line when doing a comparison.

    -
    --ignore-space-at-eol
    +
    --ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    -b
    -
    --ignore-space-change
    +
    -b
    +
    --ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    -w
    -
    --ignore-all-space
    +
    -w
    +
    --ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    --ignore-blank-lines
    +
    --ignore-blank-lines

    Ignore changes whose lines are all blank.

    -
    -I<regex>
    -
    --ignore-matching-lines=<regex>
    +
    -I<regex>
    +
    --ignore-matching-lines=<regex>
    -

    Ignore changes whose all lines match <regex>. This option may +

    Ignore changes whose all lines match <regex>. This option may be specified more than once.

    -
    --inter-hunk-context=<lines>
    +
    --inter-hunk-context=<number>
    -

    Show the context between diff hunks, up to the specified number +

    Show the context between diff hunks, up to the specified <number> of lines, thereby fusing hunks that are close to each other. Defaults to diff.interHunkContext or 0 if the config option is unset.

    -
    -W
    -
    --function-context
    +
    -W
    +
    --function-context

    Show whole function as context lines for each change. The function names are determined in the same way as -git diff works out patch hunk headers (see Defining a -custom hunk-header in gitattributes(5)).

    +git diff works out patch hunk headers (see "Defining a +custom hunk-header" in gitattributes(5)).

    -
    --exit-code
    +
    --exit-code
    -

    Make the program exit with codes similar to diff(1). +

    Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences.

    -
    --quiet
    +
    --quiet

    Disable all output of the program. Implies --exit-code. Disables execution of external diff helpers whose exit code is not trusted, i.e. their respective configuration option -diff.trustExitCode or diff.<driver>.trustExitCode or +diff.trustExitCode or diff.<driver>.trustExitCode or environment variable GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE is false.

    -
    --ext-diff
    +
    --ext-diff

    Allow an external diff helper to be executed. If you set an external diff driver with gitattributes(5), you need to use this option with git-log(1) and friends.

    -
    --no-ext-diff
    +
    --no-ext-diff

    Disallow external diff drivers.

    -
    --textconv
    -
    --no-textconv
    +
    --textconv
    +
    --no-textconv

    Allow (or disallow) external text conversion filters to be run when comparing binary files. See gitattributes(5) for @@ -1329,49 +1329,48 @@ filters are enabled by default only for git-diff(1) git-log(1), but not for git-format-patch(1) or diff plumbing commands.

    -
    --ignore-submodules[=<when>]
    +
    --ignore-submodules[=(none|untracked|dirty|all)]
    -

    Ignore changes to submodules in the diff generation. <when> can be -either "none", "untracked", "dirty" or "all", which is the default. -Using "none" will consider the submodule modified when it either contains -untracked or modified files or its HEAD differs from the commit recorded +

    Ignore changes to submodules in the diff generation. all is the default. +Using none will consider the submodule modified when it either contains +untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the -ignore option in git-config(1) or gitmodules(5). When -"untracked" is used submodules are not considered dirty when they only +ignore option in git-config(1) or gitmodules(5). When +untracked is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified -content). Using "dirty" ignores all changes to the work tree of submodules, +content). Using dirty ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was -the behavior until 1.7.0). Using "all" hides all changes to submodules.

    +the behavior until 1.7.0). Using all hides all changes to submodules.

    -
    --src-prefix=<prefix>
    +
    --src-prefix=<prefix>
    -

    Show the given source prefix instead of "a/".

    +

    Show the given source <prefix> instead of "a/".

    -
    --dst-prefix=<prefix>
    +
    --dst-prefix=<prefix>
    -

    Show the given destination prefix instead of "b/".

    +

    Show the given destination <prefix> instead of "b/".

    -
    --no-prefix
    +
    --no-prefix

    Do not show any source or destination prefix.

    -
    --default-prefix
    +
    --default-prefix

    Use the default source and destination prefixes ("a/" and "b/"). This overrides configuration variables such as diff.noprefix, diff.srcPrefix, diff.dstPrefix, and diff.mnemonicPrefix -(see git-config(1)).

    +(see git-config(1)).

    -
    --line-prefix=<prefix>
    +
    --line-prefix=<prefix>
    -

    Prepend an additional prefix to every line of output.

    +

    Prepend an additional <prefix> to every line of output.

    -
    --ita-invisible-in-index
    +
    --ita-invisible-in-index
    -

    By default entries added by "git add -N" appear as an existing -empty file in "git diff" and a new file in "git diff --cached". -This option makes the entry appear as a new file in "git diff" -and non-existent in "git diff --cached". This option could be +

    By default entries added by git add -N appear as an existing +empty file in git diff and a new file in git diff --cached. +This option makes the entry appear as a new file in git diff +and non-existent in git diff --cached. This option could be reverted with --ita-visible-in-index. Both options are experimental and could be removed in future.

    @@ -2386,8 +2385,8 @@ $ git log -2 --pretty=%h 4da45bef

    Raw output format

    -

    The raw output format from "git-diff-index", "git-diff-tree", -"git-diff-files" and "git diff --raw" are very similar.

    +

    The raw output format from git-diff-index, git-diff-tree, +git-diff-files and git diff --raw are very similar.

    These commands all compare two sets of things; what is @@ -2395,26 +2394,26 @@ compared differs:

    -
    git-diff-index <tree-ish>
    +
    git-diff-index <tree-ish>
    -

    compares the <tree-ish> and the files on the filesystem.

    +

    compares the <tree-ish> and the files on the filesystem.

    -
    git-diff-index --cached <tree-ish>
    +
    git-diff-index --cached <tree-ish>
    -

    compares the <tree-ish> and the index.

    +

    compares the <tree-ish> and the index.

    -
    git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…​]
    +
    git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]

    compares the trees named by the two arguments.

    -
    git-diff-files [<pattern>…​]
    +
    git-diff-files [<pattern>...]

    compares the index and the files on the filesystem.

    -

    The "git-diff-tree" command begins its output by printing the hash of +

    The git-diff-tree command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file.

    @@ -2489,36 +2488,36 @@ unmerged :000000 000000 0000000 0000000 U file6
    • -

      A: addition of a file

      +

      A: addition of a file

    • -

      C: copy of a file into a new one

      +

      C: copy of a file into a new one

    • -

      D: deletion of a file

      +

      D: deletion of a file

    • -

      M: modification of the contents or mode of a file

      +

      M: modification of the contents or mode of a file

    • -

      R: renaming of a file

      +

      R: renaming of a file

    • -

      T: change in the type of the file (regular file, symbolic link or submodule)

      +

      T: change in the type of the file (regular file, symbolic link or submodule)

    • -

      U: file is unmerged (you must complete the merge before it can +

      U: file is unmerged (you must complete the merge before it can be committed)

    • -

      X: "unknown" change type (most probably a bug, please report it)

      +

      X: "unknown" change type (most probably a bug, please report it)

    -

    Status letters C and R are always followed by a score (denoting the +

    Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or -copy). Status letter M may be followed by a score (denoting the +copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites.

    @@ -2545,7 +2544,7 @@ verbatim and the line is terminated by a NUL byte.

    diff format for merges

    -

    "git-diff-tree", "git-diff-files" and "git-diff --raw" +

    git-diff-tree, git-diff-files and git-diff --raw can take -c or --cc option to generate diff output also for merge commits. The output differs from the format described above in the following way:

    @@ -2618,7 +2617,7 @@ You can customize the creation of patch text via the (see git(1)), and the diff attribute (see gitattributes(5)).

    -

    What the -p option produces is slightly different from the traditional +

    What the -p option produces is slightly different from the traditional diff format:

    @@ -2643,23 +2642,21 @@ the file that the rename/copy produces, respectively.

  • It is followed by one or more extended header lines:

    -
    -
    -
    old mode <mode>
-new mode <mode>
-deleted file mode <mode>
-new file mode <mode>
-copy from <path>
-copy to <path>
-rename from <path>
-rename to <path>
-similarity index <number>
-dissimilarity index <number>
-index <hash>..<hash> <mode>
    -
    -
    -
    -

    File modes are printed as 6-digit octal numbers including the file type +

    +
    old mode <mode>
+new mode <mode>
+deleted file mode <mode>
+new file mode <mode>
+copy from <path>
+copy to <path>
+rename from <path>
+rename to <path>
+similarity index <number>
+dissimilarity index <number>
+index <hash>`..`<hash> <mode>
    +
    +
    +

    File modes <mode> are printed as 6-digit octal numbers including the file type and file permission bits.

    @@ -2675,7 +2672,7 @@ file made it into the new one.

    The index line includes the blob object names before and after the change. -The <mode> is included if the file mode does not change; otherwise, +The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode.

    • @@ -2777,20 +2774,18 @@ this (when the -c option is used):

  • It is followed by one or more extended header lines (this example shows a merge with two parents):

    -
    -
    -
    index <hash>,<hash>..<hash>
-mode <mode>,<mode>..<mode>
-new file mode <mode>
-deleted file mode <mode>,<mode>
    -
    +
    +
    index <hash>,<hash>`..__<hash>__
+{empty}`mode <mode>,<mode>``..``<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>

    The mode <mode>,<mode>..<mode> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two -<tree-ish> and are not used by combined diff format.

    +<tree-ish> and are not used by combined diff format.

  • @@ -2881,7 +2876,7 @@ two unresolved merge parents with the working tree file

    The --summary option describes newly added, deleted, renamed and -copied files. The --stat option adds diffstat(1) graph to the +copied files. The --stat option adds diffstat(1) graph to the output. These options can be combined with other options, such as -p, and are meant for human consumption.

    @@ -2995,7 +2990,7 @@ the pathname, but if that is NUL, the record will show two paths. diff --git a/git-diff.html b/git-diff.html index 87191067..f3f4011b 100644 --- a/git-diff.html +++ b/git-diff.html @@ -451,12 +451,12 @@ pre>code {

    SYNOPSIS

    -
    git diff [<options>] [<commit>] [--] [<path>…​]
-git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>…​]
-git diff [<options>] [--merge-base] <commit> [<commit>…​] <commit> [--] [<path>…​]
-git diff [<options>] <commit>…​<commit> [--] [<path>…​]
-git diff [<options>] <blob> <blob>
-git diff [<options>] --no-index [--] <path> <path>
    +
    git diff [<options>] [<commit>] [--] [<path>…​]
+git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>…​]
+git diff [<options>] [--merge-base] <commit> [<commit>…​] <commit> [--] [<path>…​]
+git diff [<options>] <commit>`…​__<commit>__ [{empty}--{empty}]{empty} [__<path>__...]{empty}
+{empty}`git diff [<options>] <blob> <blob>
+git diff [<options>] --no-index [--] <path> <path>
    @@ -471,7 +471,7 @@ files on disk.

    • -
    git diff [<options>] [--] [<path>…​]
    +
    git diff [<options>] [--] [<path>...]

    This form is to view the changes you made relative to the index (staging area for the next commit). In other @@ -479,7 +479,7 @@ words, the differences are what you could tell Git to further add to the index but you still haven’t. You can stage these changes by using git-add(1).

    -
    git diff [<options>] --no-index [--] <path> <path>
    +
    git diff [<options>] --no-index [--] <path> <path>

    This form is to compare the given two paths on the filesystem. You can omit the --no-index option when @@ -488,91 +488,91 @@ at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies --exit-code.

    -
    git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>…​]
    +
    git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]

    This form is to view the changes you staged for the next -commit relative to the named <commit>. Typically you +commit relative to the named <commit>. Typically you would want comparison with the latest commit, so if you -do not give <commit>, it defaults to HEAD. -If HEAD does not exist (e.g. unborn branches) and -<commit> is not given, it shows all staged changes. ---staged is a synonym of --cached.

    +do not give <commit>, it defaults to HEAD. +If HEAD does not exist (e.g. unborn branches) and +<commit> is not given, it shows all staged changes. +--staged is a synonym of --cached.

    -

    If --merge-base is given, instead of using <commit>, use the merge base -of <commit> and HEAD. git diff --cached --merge-base A is equivalent to +

    If --merge-base is given, instead of using <commit>, use the merge base +of <commit> and HEAD. git diff --cached --merge-base A is equivalent to git diff --cached $(git merge-base A HEAD).

    -
    git diff [<options>] [--merge-base] <commit> [--] [<path>…​]
    +
    git diff [<options>] [--merge-base] <commit> [--] [<path>...]

    This form is to view the changes you have in your -working tree relative to the named <commit>. You can -use HEAD to compare it with the latest commit, or a +working tree relative to the named <commit>. You can +use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch.

    -

    If --merge-base is given, instead of using <commit>, use the merge base -of <commit> and HEAD. git diff --merge-base A is equivalent to +

    If --merge-base is given, instead of using <commit>, use the merge base +of <commit> and HEAD. git diff --merge-base A is equivalent to git diff $(git merge-base A HEAD).

    -
    git diff [<options>] [--merge-base] <commit> <commit> [--] [<path>…​]
    +
    git diff [<options>] [--merge-base] <commit> <commit> [--] [<path>...]

    This is to view the changes between two arbitrary -<commit>.

    +<commit>.

    -

    If --merge-base is given, use the merge base of the two commits for the +

    If --merge-base is given, use the merge base of the two commits for the "before" side. git diff --merge-base A B is equivalent to git diff $(git merge-base A B) B.

    -
    git diff [<options>] <commit> <commit>…​ <commit> [--] [<path>…​]
    +
    git diff [<options>] <commit> <commit>...<commit> [--] [<path>...]

    This form is to view the results of a merge commit. The first -listed <commit> must be the merge itself; the remaining two or +listed <commit> must be the merge itself; the remaining two or more commits should be its parents. Convenient ways to produce -the desired set of revisions are to use the suffixes ^@ and -^!. If A is a merge commit, then git diff A A^@, +the desired set of revisions are to use the suffixes @ and +^!. If A is a merge commit, then git diff A A^@, git diff A^! and git show A all give the same combined diff.

    -
    git diff [<options>] <commit>..<commit> [--] [<path>…​]
    +
    git diff [<options>] <commit>..<commit> [--] [<path>...]

    This is synonymous to the earlier form (without the ..) for -viewing the changes between two arbitrary <commit>. If <commit> on +viewing the changes between two arbitrary <commit>. If <commit> on one side is omitted, it will have the same effect as -using HEAD instead.

    +using HEAD instead.

    -
    git diff [<options>] <commit>...<commit> [--] [<path>…​]
    +
    git diff [<options>] <commit>...<commit> [--] [<path>...]

    This form is to view the changes on the branch containing -and up to the second <commit>, starting at a common ancestor -of both <commit>. git diff A...B is equivalent to +and up to the second <commit>, starting at a common ancestor +of both <commit>. git diff A...B is equivalent to git diff $(git merge-base A B) B. You can omit any one -of <commit>, which has the same effect as using HEAD instead.

    +of <commit>, which has the same effect as using HEAD instead.

    Just in case you are doing something exotic, it should be -noted that all of the <commit> in the above description, except +noted that all of the <commit> in the above description, except in the --merge-base case and in the last two forms that use .. -notations, can be any <tree>. A tree of interest is the one pointed to -by the ref named AUTO_MERGE, which is written by the ort merge +notations, can be any <tree>. A tree of interest is the one pointed to +by the ref named AUTO_MERGE, which is written by the ort merge strategy upon hitting merge conflicts (see git-merge(1)). Comparing the working tree with AUTO_MERGE shows changes you’ve made so far to resolve textual conflicts (see the examples below).

    -

    For a more complete list of ways to spell <commit>, see +

    For a more complete list of ways to spell <commit>, see "SPECIFYING REVISIONS" section in gitrevisions(7). -However, "diff" is about comparing two endpoints, not ranges, -and the range notations (<commit>..<commit> and -<commit>...<commit>) do not mean a range as defined in the +However, diff is about comparing two endpoints, not ranges, +and the range notations (<commit>..<commit> and <commit>...<commit>) +do not mean a range as defined in the "SPECIFYING RANGES" section in gitrevisions(7).

    -
    git diff [<options>] <blob> <blob>
    +
    git diff [<options>] <blob> <blob>

    This form is to view the differences between the raw contents of two blob objects.

    @@ -586,71 +586,71 @@ contents of two blob objects.

    -
    -p
    -
    -u
    -
    --patch
    +
    -p
    +
    -u
    +
    --patch

    Generate patch (see Generating patch text with -p). This is the default.

    -
    -s
    -
    --no-patch
    +
    -s
    +
    --no-patch

    Suppress all output from the diff machinery. Useful for commands like git show that show the patch by default to squelch their output, or to cancel the effect of options like --patch, --stat earlier on the command line in an alias.

    -
    -U<n>
    -
    --unified=<n>
    +
    -U<n>
    +
    --unified=<n>
    -

    Generate diffs with <n> lines of context instead of +

    Generate diffs with <n> lines of context instead of the usual three. Implies --patch.

    -
    --output=<file>
    +
    --output=<file>

    Output to a specific file instead of stdout.

    -
    --output-indicator-new=<char>
    -
    --output-indicator-old=<char>
    -
    --output-indicator-context=<char>
    +
    --output-indicator-new=<char>
    +
    --output-indicator-old=<char>
    +
    --output-indicator-context=<char>

    Specify the character used to indicate new, old or context -lines in the generated patch. Normally they are +, - and +lines in the generated patch. Normally they are +, - and ' ' respectively.

    -
    --raw
    +
    --raw

    Generate the diff in raw format.

    -
    --patch-with-raw
    +
    --patch-with-raw

    Synonym for -p --raw.

    -
    --indent-heuristic
    +
    --indent-heuristic

    Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default.

    -
    --no-indent-heuristic
    +
    --no-indent-heuristic

    Disable the indent heuristic.

    -
    --minimal
    +
    --minimal

    Spend extra time to make sure the smallest possible diff is produced.

    -
    --patience
    +
    --patience

    Generate a diff using the "patience diff" algorithm.

    -
    --histogram
    +
    --histogram

    Generate a diff using the "histogram diff" algorithm.

    -
    --anchored=<text>
    +
    --anchored=<text>

    Generate a diff using the "anchored diff" algorithm.

    @@ -658,19 +658,20 @@ diff is produced.

    If a line exists in both the source and destination, exists only once, -and starts with this text, this algorithm attempts to prevent it from +and starts with <text>, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the "patience diff" algorithm internally.

    -
    --diff-algorithm={patience|minimal|histogram|myers}
    +
    --diff-algorithm=(patience|minimal|histogram|myers)

    Choose a diff algorithm. The variants are as follows:

    -
    default, myers
    +
    default
    +
    myers

    The basic greedy diff algorithm. Currently, this is the default.

    @@ -698,7 +699,7 @@ non-default value and want to use the default one, then you have to use --diff-algorithm=default option.

    -
    --stat[=<width>[,<name-width>[,<count>]]]
    +
    --stat[=<width>[,<name-width>[,<count>]]]

    Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph @@ -706,9 +707,9 @@ part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by giving another width <name-width> after a comma or by setting -diff.statNameWidth=<width>. The width of the graph part can be -limited by using --stat-graph-width=<width> or by setting -diff.statGraphWidth=<width>. Using --stat or +diff.statNameWidth=<name-width>. The width of the graph part can be +limited by using --stat-graph-width=<graph-width> or by setting +diff.statGraphWidth=<graph-width>. Using --stat or --stat-graph-width affects all commands generating a stat graph, while setting diff.statNameWidth or diff.statGraphWidth does not affect git format-patch. @@ -719,16 +720,16 @@ the first <count> lines, followed by ... if there are more.

    --stat-name-width=<name-width> and --stat-count=<count>.

    -
    --compact-summary
    +
    --compact-summary

    Output a condensed summary of extended header information such -as file creations or deletions ("new" or "gone", optionally "+l" -if it’s a symlink) and mode changes ("+x" or "-x" for adding +as file creations or deletions ("new" or "gone", optionally +l +if it’s a symlink) and mode changes (+x or -x for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies --stat.

    -
    --numstat
    +
    --numstat

    Similar to --stat, but shows number of added and deleted lines in decimal notation and pathname without @@ -736,14 +737,14 @@ abbreviation, to make it more machine friendly. For binary files, outputs two - instead of saying 0 0.

    -
    --shortstat
    +
    --shortstat

    Output only the last line of the --stat format containing total number of modified files, as well as number of added and deleted lines.

    -
    -X[<param1,param2,…​>]
    -
    --dirstat[=<param1,param2,…​>]
    +
    -X [<param>,...]
    +
    --dirstat[=<param>,...]

    Output the distribution of relative amount of changes for each sub-directory. The behavior of --dirstat can be customized by @@ -787,7 +788,7 @@ Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.

    -
    <limit>
    +
    <limit>

    An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes @@ -804,24 +805,24 @@ and accumulating child directory counts in the parent directories: --dirstat=files,10,cumulative.

    -
    --cumulative
    +
    --cumulative
    -

    Synonym for --dirstat=cumulative

    +

    Synonym for --dirstat=cumulative.

    -
    --dirstat-by-file[=<param1,param2>…​]
    +
    --dirstat-by-file[=<param>,...]
    -

    Synonym for --dirstat=files,<param1>,<param2>…​

    +

    Synonym for --dirstat=files,<param>,....

    -
    --summary
    +
    --summary

    Output a condensed summary of extended header information such as creations, renames and mode changes.

    -
    --patch-with-stat
    +
    --patch-with-stat

    Synonym for -p --stat.

    -
    -z
    +
    -z

    When --raw, --numstat, --name-only or --name-status has been given, do not munge pathnames and use NULs as output field terminators.

    @@ -831,92 +832,92 @@ explained for the configuration variable core.quotePath (see git-config(1)).

    -
    --name-only
    +
    --name-only

    Show only the name of each changed file in the post-image tree. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the git-log(1) manual page.

    -
    --name-status
    +
    --name-status

    Show only the name(s) and status of each changed file. See the description of the --diff-filter option on what the status letters mean. Just like --name-only the file names are often encoded in UTF-8.

    -
    --submodule[=<format>]
    +
    --submodule[=<format>]

    Specify how differences in submodules are shown. When specifying ---submodule=short the short format is used. This format just +--submodule=short the short format is used. This format just shows the names of the commits at the beginning and end of the range. -When --submodule or --submodule=log is specified, the log +When --submodule or --submodule=log is specified, the log format is used. This format lists the commits in the range like git-submodule(1) summary does. When --submodule=diff -is specified, the diff format is used. This format shows an +is specified, the diff format is used. This format shows an inline diff of the changes in the submodule contents between the -commit range. Defaults to diff.submodule or the short format +commit range. Defaults to diff.submodule or the short format if the config option is unset.

    -
    --color[=<when>]
    +
    --color[=<when>]

    Show colored diff. ---color (i.e. without =<when>) is the same as --color=always. +--color (i.e. without =<when>) is the same as --color=always. <when> can be one of always, never, or auto. It can be changed by the color.ui and color.diff configuration settings.

    -
    --no-color
    +
    --no-color

    Turn off colored diff. This can be used to override configuration settings. It is the same as --color=never.

    -
    --color-moved[=<mode>]
    +
    --color-moved[=<mode>]

    Moved lines of code are colored differently. It can be changed by the diff.colorMoved configuration setting. -The <mode> defaults to no if the option is not given -and to zebra if the option with no mode is given. +The <mode> defaults to no if the option is not given +and to zebra if the option with no mode is given. The mode must be one of:

    -
    no
    +
    no

    Moved lines are not highlighted.

    -
    default
    +
    default

    Is a synonym for zebra. This may change to a more sensible mode in the future.

    -
    plain
    +
    plain

    Any line that is added in one location and was removed -in another location will be colored with color.diff.newMoved. -Similarly color.diff.oldMoved will be used for removed lines +in another location will be colored with color.diff.newMoved. +Similarly color.diff.oldMoved will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation.

    -
    blocks
    +
    blocks

    Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are -painted using either the color.diff.{old,new}Moved color. +painted using either the color.diff.(old|new)Moved color. Adjacent blocks cannot be told apart.

    -
    zebra
    +
    zebra
    -

    Blocks of moved text are detected as in blocks mode. The blocks -are painted using either the color.diff.{old,new}Moved color or -color.diff.{old,new}MovedAlternative. The change between +

    Blocks of moved text are detected as in blocks mode. The blocks +are painted using either the color.diff.(old|new)Moved color or +color.diff.(old|new)MovedAlternative. The change between the two colors indicates that a new block was detected.

    -
    dimmed-zebra
    +
    dimmed-zebra
    -

    Similar to zebra, but additional dimming of uninteresting parts +

    Similar to zebra, but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. dimmed_zebra is a deprecated synonym.

    @@ -926,12 +927,12 @@ blocks are considered interesting, the rest is uninteresting.
    -
    --no-color-moved
    +
    --no-color-moved

    Turn off move detection. This can be used to override configuration settings. It is the same as --color-moved=no.

    -
    --color-moved-ws=<modes>
    +
    --color-moved-ws=<mode>,...

    This configures how whitespace is ignored when performing the move detection for --color-moved. @@ -941,26 +942,26 @@ These modes can be given as a comma separated list:

    -
    no
    +
    no

    Do not ignore whitespace when performing move detection.

    -
    ignore-space-at-eol
    +
    ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    ignore-space-change
    +
    ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    ignore-all-space
    +
    ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    allow-indentation-change
    +
    allow-indentation-change

    Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in @@ -972,33 +973,32 @@ other modes.

    -
    --no-color-moved-ws
    +
    --no-color-moved-ws

    Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as --color-moved-ws=no.

    -
    --word-diff[=<mode>]
    +
    --word-diff[=<mode>]
    -

    Show a word diff, using the <mode> to delimit changed words. -By default, words are delimited by whitespace; see ---word-diff-regex below. The <mode> defaults to plain, and +

    By default, words are delimited by whitespace; see +--word-diff-regex below. The <mode> defaults to plain, and must be one of:

    -
    color
    +
    color

    Highlight changed words using only colors. Implies --color.

    -
    plain
    +
    plain
    -

    Show words as [-removed-] and {+added+}. Makes no +

    Show words as [-removed-] and {added}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.

    -
    porcelain
    +
    porcelain

    Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the @@ -1007,7 +1007,7 @@ character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde ~ on a line of its own.

    -
    none
    +
    none

    Disable word diff again.

    @@ -1020,14 +1020,14 @@ tilde ~ on a line of its own.

    highlight the changed parts in all modes if enabled.

    -
    --word-diff-regex=<regex>
    +
    --word-diff-regex=<regex>
    -

    Use <regex> to decide what a word is, instead of considering +

    Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies --word-diff unless it was already enabled.

    Every non-overlapping match of the -<regex> is considered a word. Anything between these matches is +<regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append |[^[:space:]] to your regular expression to make sure that it matches all non-whitespace characters. @@ -1045,21 +1045,21 @@ overrides any diff driver or configuration setting. Diff drivers override configuration settings.

    -
    --color-words[=<regex>]
    +
    --color-words[=<regex>]

    Equivalent to --word-diff=color plus (if a regex was specified) --word-diff-regex=<regex>.

    -
    --no-renames
    +
    --no-renames

    Turn off rename detection, even when the configuration file gives the default to do so.

    -
    --[no-]rename-empty
    +
    --[no-]rename-empty

    Whether to use empty blobs as rename source.

    -
    --check
    +
    --check

    Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by core.whitespace @@ -1068,9 +1068,9 @@ lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible -with --exit-code.

    +with --exit-code.

    -
    --ws-error-highlight=<kind>
    +
    --ws-error-highlight=<kind>

    Highlight whitespace errors in the context, old or new lines of the diff. Multiple values are separated by comma, @@ -1081,19 +1081,19 @@ this option is not given, and the configuration variable new lines are highlighted. The whitespace errors are colored with color.diff.whitespace.

    -
    --full-index
    +
    --full-index

    Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output.

    -
    --binary
    +
    --binary

    In addition to --full-index, output a binary diff that can be applied with git-apply. Implies --patch.

    -
    --abbrev[=<n>]
    +
    --abbrev[=<n>]

    Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header @@ -1104,8 +1104,8 @@ precedence, i.e. if --full-index is specified, full blob names will be shown regardless of --abbrev. Non default number of digits can be specified with --abbrev=<n>.

    -
    -B[<n>][/<m>]
    -
    --break-rewrites[=[<n>][/<m>]]
    +
    -B[<n>][/<m>]
    +
    --break-rewrites[=[<n>][/<m>]]

    Break complete rewrite changes into pairs of delete and create. This serves two purposes:

    @@ -1114,27 +1114,27 @@ create. This serves two purposes:

    not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of -everything new, and the number m controls this aspect of the -B +everything new, and the number <m> controls this aspect of the -B option (defaults to 60%). -B/70% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).

    -

    When used with -M, a totally-rewritten file is also considered as the -source of a rename (usually -M only considers a file that disappeared -as the source of a rename), and the number n controls this aspect of -the -B option (defaults to 50%). -B20% specifies that a change with +

    When used with -M, a totally-rewritten file is also considered as the +source of a rename (usually -M only considers a file that disappeared +as the source of a rename), and the number <n> controls this aspect of +the -B option (defaults to 50%). -B20% specifies that a change with addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.

    -
    -M[<n>]
    -
    --find-renames[=<n>]
    +
    -M[<n>]
    +
    --find-renames[=<n>]

    Detect renames. -If n is specified, it is a threshold on the similarity +If <n> is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file’s size). For example, -M90% means Git should consider a delete/add pair to be a rename if more than 90% of the file @@ -1144,13 +1144,13 @@ a fraction, with a decimal point before it. I.e., -M5 becomes the same as -M5%. To limit detection to exact renames, use -M100%. The default similarity index is 50%.

    -
    -C[<n>]
    -
    --find-copies[=<n>]
    +
    -C[<n>]
    +
    --find-copies[=<n>]

    Detect copies as well as renames. See also --find-copies-harder. -If n is specified, it has the same meaning as for -M<n>.

    +If <n> is specified, it has the same meaning as for -M<n>.

    -
    --find-copies-harder
    +
    --find-copies-harder

    For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same @@ -1160,8 +1160,8 @@ copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one -C option has the same effect.

    -
    -D
    -
    --irreversible-delete
    +
    -D
    +
    --irreversible-delete

    Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and /dev/null. The resulting patch @@ -1175,7 +1175,7 @@ hence the name of the option.

    of a delete/create pair.

    -
    -l<num>
    +
    -l<num>

    The -M and -C options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an @@ -1186,10 +1186,10 @@ original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved -exceeds the specified number. Defaults to diff.renameLimit. +exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited.

    -
    --diff-filter=[(A|C|D|M|R|T|U|X|B)…​[*]]
    +
    --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]

    Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their @@ -1210,10 +1210,10 @@ that matches other criteria, nothing is selected.

    renamed entries cannot appear if detection for those types is disabled.

    -
    -S<string>
    +
    -S<string>

    Look for differences that change the number of occurrences of -the specified string (i.e. addition/deletion) in a file. +the specified <string> (i.e. addition/deletion) in a file. Intended for the scripter’s use.

    It is useful when you’re looking for an exact block of code (like a @@ -1226,10 +1226,10 @@ very first version of the block.

    Binary files are searched as well.

    -
    -G<regex>
    +
    -G<regex>

    Look for differences whose patch text contains added/removed -lines that match <regex>.

    +lines that match <regex>.

    To illustrate the difference between -S<regex> --pickaxe-regex and -G<regex>, consider a commit with the following diff in the same @@ -1256,7 +1256,7 @@ filter will be ignored.

    information.

    -
    --find-object=<object-id>
    +
    --find-object=<object-id>

    Look for differences that change the number of occurrences of the specified object. Similar to -S, just the argument is different @@ -1267,18 +1267,18 @@ object id.

    git-log to also find trees.

    -
    --pickaxe-all
    +
    --pickaxe-all

    When -S or -G finds a change, show all the changes in that changeset, not just the files that contain the change -in <string>.

    +in <string>.

    -
    --pickaxe-regex
    +
    --pickaxe-regex
    -

    Treat the <string> given to -S as an extended POSIX regular +

    Treat the <string> given to -S as an extended POSIX regular expression to match.

    -
    -O<orderfile>
    +
    -O<orderfile>

    Control the order in which files appear in the output. This overrides the diff.orderFile configuration variable @@ -1286,7 +1286,7 @@ This overrides the diff.orderFile configuration variable use -O/dev/null.

    The output order is determined by the order of glob patterns in -<orderfile>. +<orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. @@ -1298,7 +1298,7 @@ but no earlier patterns), their output order relative to each other is the normal order.

    -

    <orderfile> is parsed as follows:

    +

    <orderfile> is parsed as follows:

    @@ -1322,117 +1322,117 @@ pattern if it starts with a hash.

    Patterns have the same syntax and semantics as patterns used for -fnmatch(3) without the FNM_PATHNAME flag, except a pathname also +fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "foo*bar" matches "fooasdfbar" and "foo/bar/baz/asdf" but not "foobarx".

    -
    --skip-to=<file>
    -
    --rotate-to=<file>
    +
    --skip-to=<file>
    +
    --rotate-to=<file>
    -

    Discard the files before the named <file> from the output +

    Discard the files before the named <file> from the output (i.e. skip to), or move them to the end of the output (i.e. rotate to). These options were invented primarily for the use of the git difftool command, and may not be very useful otherwise.

    -
    -R
    +
    -R

    Swap two inputs; that is, show differences from index or on-disk file to tree contents.

    -
    --relative[=<path>]
    -
    --no-relative
    +
    --relative[=<path>]
    +
    --no-relative

    When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative -to by giving a <path> as an argument. +to by giving a <path> as an argument. --no-relative can be used to countermand both diff.relative config option and previous --relative.

    -
    -a
    -
    --text
    +
    -a
    +
    --text

    Treat all files as text.

    -
    --ignore-cr-at-eol
    +
    --ignore-cr-at-eol

    Ignore carriage-return at the end of line when doing a comparison.

    -
    --ignore-space-at-eol
    +
    --ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    -b
    -
    --ignore-space-change
    +
    -b
    +
    --ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    -w
    -
    --ignore-all-space
    +
    -w
    +
    --ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    --ignore-blank-lines
    +
    --ignore-blank-lines

    Ignore changes whose lines are all blank.

    -
    -I<regex>
    -
    --ignore-matching-lines=<regex>
    +
    -I<regex>
    +
    --ignore-matching-lines=<regex>
    -

    Ignore changes whose all lines match <regex>. This option may +

    Ignore changes whose all lines match <regex>. This option may be specified more than once.

    -
    --inter-hunk-context=<lines>
    +
    --inter-hunk-context=<number>
    -

    Show the context between diff hunks, up to the specified number +

    Show the context between diff hunks, up to the specified <number> of lines, thereby fusing hunks that are close to each other. Defaults to diff.interHunkContext or 0 if the config option is unset.

    -
    -W
    -
    --function-context
    +
    -W
    +
    --function-context

    Show whole function as context lines for each change. The function names are determined in the same way as -git diff works out patch hunk headers (see Defining a -custom hunk-header in gitattributes(5)).

    +git diff works out patch hunk headers (see "Defining a +custom hunk-header" in gitattributes(5)).

    -
    --exit-code
    +
    --exit-code
    -

    Make the program exit with codes similar to diff(1). +

    Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences.

    -
    --quiet
    +
    --quiet

    Disable all output of the program. Implies --exit-code. Disables execution of external diff helpers whose exit code is not trusted, i.e. their respective configuration option -diff.trustExitCode or diff.<driver>.trustExitCode or +diff.trustExitCode or diff.<driver>.trustExitCode or environment variable GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE is false.

    -
    --ext-diff
    +
    --ext-diff

    Allow an external diff helper to be executed. If you set an external diff driver with gitattributes(5), you need to use this option with git-log(1) and friends.

    -
    --no-ext-diff
    +
    --no-ext-diff

    Disallow external diff drivers.

    -
    --textconv
    -
    --no-textconv
    +
    --textconv
    +
    --no-textconv

    Allow (or disallow) external text conversion filters to be run when comparing binary files. See gitattributes(5) for @@ -1443,49 +1443,48 @@ filters are enabled by default only for git-diff(1) git-log(1), but not for git-format-patch(1) or diff plumbing commands.

    -
    --ignore-submodules[=<when>]
    +
    --ignore-submodules[=(none|untracked|dirty|all)]
    -

    Ignore changes to submodules in the diff generation. <when> can be -either "none", "untracked", "dirty" or "all", which is the default. -Using "none" will consider the submodule modified when it either contains -untracked or modified files or its HEAD differs from the commit recorded +

    Ignore changes to submodules in the diff generation. all is the default. +Using none will consider the submodule modified when it either contains +untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the -ignore option in git-config(1) or gitmodules(5). When -"untracked" is used submodules are not considered dirty when they only +ignore option in git-config(1) or gitmodules(5). When +untracked is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified -content). Using "dirty" ignores all changes to the work tree of submodules, +content). Using dirty ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was -the behavior until 1.7.0). Using "all" hides all changes to submodules.

    +the behavior until 1.7.0). Using all hides all changes to submodules.

    -
    --src-prefix=<prefix>
    +
    --src-prefix=<prefix>
    -

    Show the given source prefix instead of "a/".

    +

    Show the given source <prefix> instead of "a/".

    -
    --dst-prefix=<prefix>
    +
    --dst-prefix=<prefix>
    -

    Show the given destination prefix instead of "b/".

    +

    Show the given destination <prefix> instead of "b/".

    -
    --no-prefix
    +
    --no-prefix

    Do not show any source or destination prefix.

    -
    --default-prefix
    +
    --default-prefix

    Use the default source and destination prefixes ("a/" and "b/"). This overrides configuration variables such as diff.noprefix, diff.srcPrefix, diff.dstPrefix, and diff.mnemonicPrefix -(see git-config(1)).

    +(see git-config(1)).

    -
    --line-prefix=<prefix>
    +
    --line-prefix=<prefix>
    -

    Prepend an additional prefix to every line of output.

    +

    Prepend an additional <prefix> to every line of output.

    -
    --ita-invisible-in-index
    +
    --ita-invisible-in-index
    -

    By default entries added by "git add -N" appear as an existing -empty file in "git diff" and a new file in "git diff --cached". -This option makes the entry appear as a new file in "git diff" -and non-existent in "git diff --cached". This option could be +

    By default entries added by git add -N appear as an existing +empty file in git diff and a new file in git diff --cached. +This option makes the entry appear as a new file in git diff +and non-existent in git diff --cached. This option could be reverted with --ita-visible-in-index. Both options are experimental and could be removed in future.

    @@ -1497,25 +1496,46 @@ experimental and could be removed in future.

    -
    -1 --base
    -
    -2 --ours
    -
    -3 --theirs
    -
    -

    Compare the working tree with the "base" version (stage #1), -"our branch" (stage #2) or "their branch" (stage #3). The -index contains these stages only for unmerged entries i.e. +

    -1
    +
    --base
    +
    -2
    +
    --ours
    +
    -3
    +
    --theirs
    +
    +

    Compare the working tree with

    +
    +
    +
    +
      +
    • +

      the "base" version (stage #1) when using -1 or --base,

      +
      • +
    • +

      "our branch" (stage #2) when using -2 or --ours, or

      +
      • +
    • +

      "their branch" (stage #3) when using -3 or --theirs.

      +
      • +
    +
    +
    +
    +
    +

    The index contains these stages only for unmerged entries i.e. while resolving conflicts. See git-read-tree(1) section "3-Way Merge" for detailed information.

    +
    -
    -0
    +
    -0

    Omit diff output for unmerged entries and just show "Unmerged". Can be used only when comparing the working tree with the index.

    -
    <path>…​
    +
    <path>...
    -

    The <paths> parameters, when given, are used to limit +

    The <path> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them).

    @@ -1527,8 +1547,8 @@ names and get diff for all files under them).

    Raw output format

    -

    The raw output format from "git-diff-index", "git-diff-tree", -"git-diff-files" and "git diff --raw" are very similar.

    +

    The raw output format from git-diff-index, git-diff-tree, +git-diff-files and git diff --raw are very similar.

    These commands all compare two sets of things; what is @@ -1536,26 +1556,26 @@ compared differs:

    -
    git-diff-index <tree-ish>
    +
    git-diff-index <tree-ish>
    -

    compares the <tree-ish> and the files on the filesystem.

    +

    compares the <tree-ish> and the files on the filesystem.

    -
    git-diff-index --cached <tree-ish>
    +
    git-diff-index --cached <tree-ish>
    -

    compares the <tree-ish> and the index.

    +

    compares the <tree-ish> and the index.

    -
    git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…​]
    +
    git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]

    compares the trees named by the two arguments.

    -
    git-diff-files [<pattern>…​]
    +
    git-diff-files [<pattern>...]

    compares the index and the files on the filesystem.

    -

    The "git-diff-tree" command begins its output by printing the hash of +

    The git-diff-tree command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file.

    @@ -1630,36 +1650,36 @@ unmerged :000000 000000 0000000 0000000 U file6
    • -

      A: addition of a file

      +

      A: addition of a file

    • -

      C: copy of a file into a new one

      +

      C: copy of a file into a new one

    • -

      D: deletion of a file

      +

      D: deletion of a file

    • -

      M: modification of the contents or mode of a file

      +

      M: modification of the contents or mode of a file

    • -

      R: renaming of a file

      +

      R: renaming of a file

    • -

      T: change in the type of the file (regular file, symbolic link or submodule)

      +

      T: change in the type of the file (regular file, symbolic link or submodule)

    • -

      U: file is unmerged (you must complete the merge before it can +

      U: file is unmerged (you must complete the merge before it can be committed)

    • -

      X: "unknown" change type (most probably a bug, please report it)

      +

      X: "unknown" change type (most probably a bug, please report it)

    -

    Status letters C and R are always followed by a score (denoting the +

    Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or -copy). Status letter M may be followed by a score (denoting the +copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites.

    @@ -1686,7 +1706,7 @@ verbatim and the line is terminated by a NUL byte.

    diff format for merges

    -

    "git-diff-tree", "git-diff-files" and "git-diff --raw" +

    git-diff-tree, git-diff-files and git-diff --raw can take -c or --cc option to generate diff output also for merge commits. The output differs from the format described above in the following way:

    @@ -1759,7 +1779,7 @@ You can customize the creation of patch text via the (see git(1)), and the diff attribute (see gitattributes(5)).

    -

    What the -p option produces is slightly different from the traditional +

    What the -p option produces is slightly different from the traditional diff format:

    @@ -1784,23 +1804,21 @@ the file that the rename/copy produces, respectively.

  • It is followed by one or more extended header lines:

    -
    -
    -
    old mode <mode>
-new mode <mode>
-deleted file mode <mode>
-new file mode <mode>
-copy from <path>
-copy to <path>
-rename from <path>
-rename to <path>
-similarity index <number>
-dissimilarity index <number>
-index <hash>..<hash> <mode>
    -
    -
    -
    -

    File modes are printed as 6-digit octal numbers including the file type +

    +
    old mode <mode>
+new mode <mode>
+deleted file mode <mode>
+new file mode <mode>
+copy from <path>
+copy to <path>
+rename from <path>
+rename to <path>
+similarity index <number>
+dissimilarity index <number>
+index <hash>`..`<hash> <mode>
    +
    +
    +

    File modes <mode> are printed as 6-digit octal numbers including the file type and file permission bits.

    @@ -1816,7 +1834,7 @@ file made it into the new one.

    The index line includes the blob object names before and after the change. -The <mode> is included if the file mode does not change; otherwise, +The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode.

    • @@ -1918,20 +1936,18 @@ this (when the -c option is used):

  • It is followed by one or more extended header lines (this example shows a merge with two parents):

    -
    -
    -
    index <hash>,<hash>..<hash>
-mode <mode>,<mode>..<mode>
-new file mode <mode>
-deleted file mode <mode>,<mode>
    -
    +
    +
    index <hash>,<hash>`..__<hash>__
+{empty}`mode <mode>,<mode>``..``<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>

    The mode <mode>,<mode>..<mode> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two -<tree-ish> and are not used by combined diff format.

    +<tree-ish> and are not used by combined diff format.

  • @@ -2022,7 +2038,7 @@ two unresolved merge parents with the working tree file

    The --summary option describes newly added, deleted, renamed and -copied files. The --stat option adds diffstat(1) graph to the +copied files. The --stat option adds diffstat(1) graph to the output. These options can be combined with other options, such as -p, and are meant for human consumption.

    @@ -2269,23 +2285,23 @@ as what’s found there:

    -
    diff.autoRefreshIndex
    +
    diff.autoRefreshIndex
    -

    When using git diff to compare with work tree +

    When using git diff to compare with work tree files, do not consider stat-only changes as changed. Instead, silently run git update-index --refresh to update the cached stat information for paths whose contents in the work tree match the contents in the -index. This option defaults to true. Note that this -affects only git diff Porcelain, and not lower level -diff commands such as git diff-files.

    +index. This option defaults to true. Note that this +affects only git diff Porcelain, and not lower level +diff commands such as git diff-files.

    -
    diff.dirstat
    +
    diff.dirstat

    A comma separated list of --dirstat parameters specifying the -default behavior of the --dirstat option to git-diff(1) -and friends. The defaults can be overridden on the command line -(using --dirstat=<param1,param2,...>). The fallback defaults +default behavior of the --dirstat option to git diff and friends. +The defaults can be overridden on the command line +(using --dirstat=<param>,...). The fallback defaults (when not changed by diff.dirstat) are changes,noncumulative,3. The following parameters are available:

    @@ -2324,7 +2340,7 @@ Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.

    -
    <limit>
    +
    <limit>

    An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes @@ -2341,66 +2357,66 @@ and accumulating child directory counts in the parent directories: files,10,cumulative.

    -
    diff.statNameWidth
    +
    diff.statNameWidth
    -

    Limit the width of the filename part in --stat output. If set, applies -to all commands generating --stat output except format-patch.

    +

    Limit the width of the filename part in --stat output. If set, applies +to all commands generating --stat output except format-patch.

    -
    diff.statGraphWidth
    +
    diff.statGraphWidth
    -

    Limit the width of the graph part in --stat output. If set, applies -to all commands generating --stat output except format-patch.

    +

    Limit the width of the graph part in --stat output. If set, applies +to all commands generating --stat output except format-patch.

    -
    diff.context
    +
    diff.context
    -

    Generate diffs with <n> lines of context instead of the default -of 3. This value is overridden by the -U option.

    +

    Generate diffs with <n> lines of context instead of the default +of 3. This value is overridden by the -U option.

    -
    diff.interHunkContext
    +
    diff.interHunkContext

    Show the context between diff hunks, up to the specified number of lines, thereby fusing the hunks that are close to each other. This value serves as the default for the --inter-hunk-context command line option.

    -
    diff.external
    +
    diff.external

    If this config variable is set, diff generation is not performed using the internal diff machinery, but using the -given command. Can be overridden with the ‘GIT_EXTERNAL_DIFF’ +given command. Can be overridden with the GIT_EXTERNAL_DIFF environment variable. The command is called with parameters as described under "git Diffs" in git(1). Note: if you want to use an external diff program only on a subset of your files, you might want to use gitattributes(5) instead.

    -
    diff.trustExitCode
    +
    diff.trustExitCode
    -

    If this boolean value is set to true then the +

    If this boolean value is set to true then the diff.external command is expected to return exit code 0 if it considers the input files to be equal or 1 if it -considers them to be different, like diff(1). -If it is set to false, which is the default, then the command -is expected to return exit code 0 regardless of equality. +considers them to be different, like diff(1). +If it is set to false, which is the default, then the command +is expected to return exit code 0 regardless of equality. Any other exit code causes Git to report a fatal error.

    -
    diff.ignoreSubmodules
    +
    diff.ignoreSubmodules
    -

    Sets the default value of --ignore-submodules. Note that this -affects only git diff Porcelain, and not lower level diff -commands such as git diff-files. git checkout -and git switch also honor +

    Sets the default value of --ignore-submodules. Note that this +affects only git diff Porcelain, and not lower level diff +commands such as git diff-files. git checkout +and git switch also honor this setting when reporting uncommitted changes. Setting it to -all disables the submodule summary normally shown by git commit -and git status when status.submoduleSummary is set unless it is -overridden by using the --ignore-submodules command-line option. -The git submodule commands are not affected by this setting. +all disables the submodule summary normally shown by git commit +and git status when status.submoduleSummary is set unless it is +overridden by using the --ignore-submodules command-line option. +The git submodule commands are not affected by this setting. By default this is set to untracked so that any untracked submodules are ignored.

    -
    diff.mnemonicPrefix
    +
    diff.mnemonicPrefix
    -

    If set, git diff uses a prefix pair that is different from the -standard "a/" and "b/" depending on what is being compared. When +

    If set, git diff uses a prefix pair that is different from the +standard a/ and b/ depending on what is being compared. When this configuration is in effect, reverse diff output also swaps the order of the prefixes:

    @@ -2417,121 +2433,121 @@ the order of the prefixes:

    compares a (c)ommit and the (i)ndex;

    -
    git diff HEAD:file1 file2
    +
    git diff HEAD:<file1> <file2>

    compares an (o)bject and a (w)ork tree entity;

    -
    git diff --no-index a b
    +
    git diff --no-index <a> <b>
    -

    compares two non-git things (1) and (2).

    +

    compares two non-git things <a> and <b>.

    • -
    diff.noPrefix
    +
    diff.noPrefix
    -

    If set, git diff does not show any source or destination prefix.

    +

    If set, git diff does not show any source or destination prefix.

    -
    diff.srcPrefix
    +
    diff.srcPrefix
    -

    If set, git diff uses this source prefix. Defaults to "a/".

    +

    If set, git diff uses this source prefix. Defaults to a/.

    -
    diff.dstPrefix
    +
    diff.dstPrefix
    -

    If set, git diff uses this destination prefix. Defaults to "b/".

    +

    If set, git diff uses this destination prefix. Defaults to b/.

    -
    diff.relative
    +
    diff.relative
    -

    If set to true, git diff does not show changes outside of the directory +

    If set to true, git diff does not show changes outside of the directory and show pathnames relative to the current directory.

    -
    diff.orderFile
    +
    diff.orderFile

    File indicating how to order files within a diff. -See the -O option to git-diff(1) for details. +See the -O option for details. If diff.orderFile is a relative pathname, it is treated as relative to the top of the working tree.

    -
    diff.renameLimit
    +
    diff.renameLimit

    The number of files to consider in the exhaustive portion of -copy/rename detection; equivalent to the git diff option +copy/rename detection; equivalent to the git diff option -l. If not set, the default value is currently 1000. This setting has no effect if rename detection is turned off.

    -
    diff.renames
    +
    diff.renames
    -

    Whether and how Git detects renames. If set to "false", -rename detection is disabled. If set to "true", basic rename -detection is enabled. If set to "copies" or "copy", Git will -detect copies, as well. Defaults to true. Note that this -affects only git diff Porcelain like git-diff(1) and +

    Whether and how Git detects renames. If set to false, +rename detection is disabled. If set to true, basic rename +detection is enabled. If set to copies or copy, Git will +detect copies, as well. Defaults to true. Note that this +affects only git diff Porcelain like git-diff(1) and git-log(1), and not lower level commands such as git-diff-files(1).

    -
    diff.suppressBlankEmpty
    +
    diff.suppressBlankEmpty

    A boolean to inhibit the standard behavior of printing a space -before each empty output line. Defaults to false.

    +before each empty output line. Defaults to false.

    -
    diff.submodule
    +
    diff.submodule

    Specify the format in which differences in submodules are -shown. The "short" format just shows the names of the commits -at the beginning and end of the range. The "log" format lists +shown. The short format just shows the names of the commits +at the beginning and end of the range. The log format lists the commits in the range like git-submodule(1) summary -does. The "diff" format shows an inline diff of the changed -contents of the submodule. Defaults to "short".

    +does. The diff format shows an inline diff of the changed +contents of the submodule. Defaults to short.

    -
    diff.wordRegex
    +
    diff.wordRegex

    A POSIX Extended Regular Expression used to determine what is a "word" when performing word-by-word difference calculations. Character sequences that match the regular expression are "words", all other characters are ignorable whitespace.

    -
    diff.<driver>.command
    +
    diff.<driver>.command

    The custom diff driver command. See gitattributes(5) for details.

    -
    diff.<driver>.trustExitCode
    +
    diff.<driver>.trustExitCode
    -

    If this boolean value is set to true then the +

    If this boolean value is set to true then the diff.<driver>.command command is expected to return exit code 0 if it considers the input files to be equal or 1 if it -considers them to be different, like diff(1). -If it is set to false, which is the default, then the command +considers them to be different, like diff(1). +If it is set to false, which is the default, then the command is expected to return exit code 0 regardless of equality. Any other exit code causes Git to report a fatal error.

    -
    diff.<driver>.xfuncname
    +
    diff.<driver>.xfuncname

    The regular expression that the diff driver should use to recognize the hunk header. A built-in pattern may also be used. See gitattributes(5) for details.

    -
    diff.<driver>.binary
    +
    diff.<driver>.binary
    -

    Set this option to true to make the diff driver treat files as +

    Set this option to true to make the diff driver treat files as binary. See gitattributes(5) for details.

    -
    diff.<driver>.textconv
    +
    diff.<driver>.textconv

    The command that the diff driver should call to generate the text-converted version of a file. The result of the conversion is used to generate a human-readable diff. See gitattributes(5) for details.

    -
    diff.<driver>.wordRegex
    +
    diff.<driver>.wordRegex

    The regular expression that the diff driver should use to split words in a line. See gitattributes(5) for details.

    -
    diff.<driver>.cachetextconv
    +
    diff.<driver>.cachetextconv
    -

    Set this option to true to make the diff driver cache the text +

    Set this option to true to make the diff driver cache the text conversion outputs. See gitattributes(5) for details.

    @@ -2638,19 +2654,20 @@ conversion outputs. See gitattributes(5) for d
    -
    diff.indentHeuristic
    +
    diff.indentHeuristic

    Set this option to false to disable the default heuristics that shift diff hunk boundaries to make patches easier to read.

    -
    diff.algorithm
    +
    diff.algorithm

    Choose a diff algorithm. The variants are as follows:

    -
    default, myers
    +
    default
    +
    myers

    The basic greedy diff algorithm. Currently, this is the default.

    @@ -2673,7 +2690,7 @@ low-occurrence common elements".

    -
    diff.wsErrorHighlight
    +
    diff.wsErrorHighlight

    Highlight whitespace errors in the context, old or new lines of the diff. Multiple values are separated by comma, @@ -2683,19 +2700,19 @@ whitespace errors are colored with color.diff.whitespace. The command line option --ws-error-highlight=<kind> overrides this setting.

    -
    diff.colorMoved
    +
    diff.colorMoved
    -

    If set to either a valid <mode> or a true value, moved lines -in a diff are colored differently, for details of valid modes -see --color-moved in git-diff(1). If simply set to -true the default color mode will be used. When set to false, -moved lines are not colored.

    +

    If set to either a valid <mode> or a true value, moved lines +in a diff are colored differently. +For details of valid modes see --color-moved. +If simply set to true the default color mode will be used. When +set to false, moved lines are not colored.

    -
    diff.colorMovedWS
    +
    diff.colorMovedWS

    When moved lines are colored using e.g. the diff.colorMoved setting, -this option controls the <mode> how spaces are treated. -For details of valid modes see --color-moved-ws in git-diff(1).

    +this option controls the mode how spaces are treated. +For details of valid modes see --color-moved-ws in git-diff(1).

    @@ -2705,7 +2722,7 @@ For details of valid modes see --color-moved-ws in SEE ALSO
    -

    diff(1), +

    diff(1), git-difftool(1), git-log(1), gitdiffcore(7), @@ -2726,7 +2743,7 @@ For details of valid modes see --color-moved-ws in

    -Last updated 2023-12-27 15:50:18 -0800 +Last updated 2024-12-04 13:43:27 +0900
    diff --git a/git-diff.txt b/git-diff.txt index c065f023..e19f31e8 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -8,13 +8,13 @@ git-diff - Show changes between commits, commit and working tree, etc SYNOPSIS -------- -[verse] -'git diff' [] [] [--] [...] -'git diff' [] --cached [--merge-base] [] [--] [...] -'git diff' [] [--merge-base] [...] [--] [...] -'git diff' [] ... [--] [...] -'git diff' [] -'git diff' [] --no-index [--] +[synopsis] +git diff [] [] [--] [...] +git diff [] --cached [--merge-base] [] [--] [...] +git diff [] [--merge-base] [...] [--] [...] +git diff [] ... [--] [...] +git diff [] +git diff [] --no-index [--] DESCRIPTION ----------- @@ -23,7 +23,7 @@ between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk. -'git diff' [] [--] [...]:: +`git diff [] [--] [...]`:: This form is to view the changes you made relative to the index (staging area for the next commit). In other @@ -31,7 +31,7 @@ files on disk. further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]. -'git diff' [] --no-index [--] :: +`git diff [] --no-index [--] `:: This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when @@ -40,82 +40,82 @@ files on disk. or when running the command outside a working tree controlled by Git. This form implies `--exit-code`. -'git diff' [] --cached [--merge-base] [] [--] [...]:: +`git diff [] --cached [--merge-base] [] [--] [...]`:: This form is to view the changes you staged for the next - commit relative to the named . Typically you + commit relative to the named __. Typically you would want comparison with the latest commit, so if you - do not give , it defaults to HEAD. - If HEAD does not exist (e.g. unborn branches) and - is not given, it shows all staged changes. - --staged is a synonym of --cached. + do not give __, it defaults to `HEAD`. + If `HEAD` does not exist (e.g. unborn branches) and + __ is not given, it shows all staged changes. + `--staged` is a synonym of `--cached`. + -If --merge-base is given, instead of using , use the merge base -of and HEAD. `git diff --cached --merge-base A` is equivalent to +If `--merge-base` is given, instead of using __, use the merge base +of __ and `HEAD`. `git diff --cached --merge-base A` is equivalent to `git diff --cached $(git merge-base A HEAD)`. -'git diff' [] [--merge-base] [--] [...]:: +`git diff [] [--merge-base] [--] [...]`:: This form is to view the changes you have in your - working tree relative to the named . You can - use HEAD to compare it with the latest commit, or a + working tree relative to the named __. You can + use `HEAD` to compare it with the latest commit, or a branch name to compare with the tip of a different branch. + -If --merge-base is given, instead of using , use the merge base -of and HEAD. `git diff --merge-base A` is equivalent to +If `--merge-base` is given, instead of using __, use the merge base +of __ and `HEAD`. `git diff --merge-base A` is equivalent to `git diff $(git merge-base A HEAD)`. -'git diff' [] [--merge-base] [--] [...]:: +`git diff [] [--merge-base] [--] [...]`:: This is to view the changes between two arbitrary - . + __. + -If --merge-base is given, use the merge base of the two commits for the +If `--merge-base` is given, use the merge base of the two commits for the "before" side. `git diff --merge-base A B` is equivalent to `git diff $(git merge-base A B) B`. -'git diff' [] ... [--] [...]:: +`git diff [] ... [--] [...]`:: This form is to view the results of a merge commit. The first - listed must be the merge itself; the remaining two or + listed __ must be the merge itself; the remaining two or more commits should be its parents. Convenient ways to produce - the desired set of revisions are to use the suffixes `^@` and - `^!`. If A is a merge commit, then `git diff A A^@`, + the desired set of revisions are to use the suffixes `@` and + `^!`. If `A` is a merge commit, then `git diff A A^@`, `git diff A^!` and `git show A` all give the same combined diff. -'git diff' [] .. [--] [...]:: +`git diff [] .. [--] [...]`:: This is synonymous to the earlier form (without the `..`) for - viewing the changes between two arbitrary . If on + viewing the changes between two arbitrary __. If __ on one side is omitted, it will have the same effect as - using HEAD instead. + using `HEAD` instead. -'git diff' [] \... [--] [...]:: +`git diff [] ... [--] [...]`:: This form is to view the changes on the branch containing - and up to the second , starting at a common ancestor - of both . `git diff A...B` is equivalent to + and up to the second __, starting at a common ancestor + of both __. `git diff A...B` is equivalent to `git diff $(git merge-base A B) B`. You can omit any one - of , which has the same effect as using HEAD instead. + of __, which has the same effect as using `HEAD` instead. Just in case you are doing something exotic, it should be -noted that all of the in the above description, except +noted that all of the __ in the above description, except in the `--merge-base` case and in the last two forms that use `..` -notations, can be any . A tree of interest is the one pointed to -by the ref named `AUTO_MERGE`, which is written by the 'ort' merge +notations, can be any __. A tree of interest is the one pointed to +by the ref named `AUTO_MERGE`, which is written by the `ort` merge strategy upon hitting merge conflicts (see linkgit:git-merge[1]). Comparing the working tree with `AUTO_MERGE` shows changes you've made so far to resolve textual conflicts (see the examples below). -For a more complete list of ways to spell , see +For a more complete list of ways to spell __, see "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. -However, "diff" is about comparing two _endpoints_, not ranges, -and the range notations (`..` and -`...`) do not mean a range as defined in the +However, `diff` is about comparing two _endpoints_, not ranges, +and the range notations (`..` and `...`) +do not mean a range as defined in the "SPECIFYING RANGES" section in linkgit:gitrevisions[7]. -'git diff' [] :: +`git diff [] `:: This form is to view the differences between the raw contents of two blob objects. @@ -125,22 +125,31 @@ OPTIONS :git-diff: 1 include::diff-options.txt[] --1 --base:: --2 --ours:: --3 --theirs:: - Compare the working tree with the "base" version (stage #1), - "our branch" (stage #2) or "their branch" (stage #3). The - index contains these stages only for unmerged entries i.e. - while resolving conflicts. See linkgit:git-read-tree[1] - section "3-Way Merge" for detailed information. +`-1`:: +`--base`:: +`-2`:: +`--ours`:: +`-3`:: +`--theirs`:: + Compare the working tree with ++ +-- + * the "base" version (stage #1) when using `-1` or `--base`, + * "our branch" (stage #2) when using `-2` or `--ours`, or + * "their branch" (stage #3) when using `-3` or `--theirs`. +-- ++ +The index contains these stages only for unmerged entries i.e. +while resolving conflicts. See linkgit:git-read-tree[1] +section "3-Way Merge" for detailed information. --0:: +`-0`:: Omit diff output for unmerged entries and just show "Unmerged". Can be used only when comparing the working tree with the index. -...:: - The parameters, when given, are used to limit +`...`:: + The __ parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them). @@ -225,11 +234,12 @@ CONFIGURATION include::includes/cmd-config-section-all.txt[] +:git-diff: 1 include::config/diff.txt[] SEE ALSO -------- -diff(1), +`diff`(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], diff --git a/git-format-patch.html b/git-format-patch.html index de9dfeda..1502a542 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -581,47 +581,47 @@ reference.

    Generate plain patches without any diffstats.

    -
    -U<n>
    -
    --unified=<n>
    +
    -U<n>
    +
    --unified=<n>
    -

    Generate diffs with <n> lines of context instead of +

    Generate diffs with <n> lines of context instead of the usual three.

    -
    --output=<file>
    +
    --output=<file>

    Output to a specific file instead of stdout.

    -
    --output-indicator-new=<char>
    -
    --output-indicator-old=<char>
    -
    --output-indicator-context=<char>
    +
    --output-indicator-new=<char>
    +
    --output-indicator-old=<char>
    +
    --output-indicator-context=<char>

    Specify the character used to indicate new, old or context -lines in the generated patch. Normally they are +, - and +lines in the generated patch. Normally they are +, - and ' ' respectively.

    -
    --indent-heuristic
    +
    --indent-heuristic

    Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default.

    -
    --no-indent-heuristic
    +
    --no-indent-heuristic

    Disable the indent heuristic.

    -
    --minimal
    +
    --minimal

    Spend extra time to make sure the smallest possible diff is produced.

    -
    --patience
    +
    --patience

    Generate a diff using the "patience diff" algorithm.

    -
    --histogram
    +
    --histogram

    Generate a diff using the "histogram diff" algorithm.

    -
    --anchored=<text>
    +
    --anchored=<text>

    Generate a diff using the "anchored diff" algorithm.

    @@ -629,19 +629,20 @@ diff is produced.

    If a line exists in both the source and destination, exists only once, -and starts with this text, this algorithm attempts to prevent it from +and starts with <text>, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the "patience diff" algorithm internally.

    -
    --diff-algorithm={patience|minimal|histogram|myers}
    +
    --diff-algorithm=(patience|minimal|histogram|myers)

    Choose a diff algorithm. The variants are as follows:

    -
    default, myers
    +
    default
    +
    myers

    The basic greedy diff algorithm. Currently, this is the default.

    @@ -669,7 +670,7 @@ non-default value and want to use the default one, then you have to use --diff-algorithm=default option.

    -
    --stat[=<width>[,<name-width>[,<count>]]]
    +
    --stat[=<width>[,<name-width>[,<count>]]]

    Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph @@ -677,9 +678,9 @@ part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by giving another width <name-width> after a comma or by setting -diff.statNameWidth=<width>. The width of the graph part can be -limited by using --stat-graph-width=<width> or by setting -diff.statGraphWidth=<width>. Using --stat or +diff.statNameWidth=<name-width>. The width of the graph part can be +limited by using --stat-graph-width=<graph-width> or by setting +diff.statGraphWidth=<graph-width>. Using --stat or --stat-graph-width affects all commands generating a stat graph, while setting diff.statNameWidth or diff.statGraphWidth does not affect git format-patch. @@ -690,16 +691,16 @@ the first <count> lines, followed by ... if there are more.

    --stat-name-width=<name-width> and --stat-count=<count>.

    -
    --compact-summary
    +
    --compact-summary

    Output a condensed summary of extended header information such -as file creations or deletions ("new" or "gone", optionally "+l" -if it’s a symlink) and mode changes ("+x" or "-x" for adding +as file creations or deletions ("new" or "gone", optionally +l +if it’s a symlink) and mode changes (+x or -x for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies --stat.

    -
    --numstat
    +
    --numstat

    Similar to --stat, but shows number of added and deleted lines in decimal notation and pathname without @@ -707,14 +708,14 @@ abbreviation, to make it more machine friendly. For binary files, outputs two - instead of saying 0 0.

    -
    --shortstat
    +
    --shortstat

    Output only the last line of the --stat format containing total number of modified files, as well as number of added and deleted lines.

    -
    -X[<param1,param2,…​>]
    -
    --dirstat[=<param1,param2,…​>]
    +
    -X [<param>,...]
    +
    --dirstat[=<param>,...]

    Output the distribution of relative amount of changes for each sub-directory. The behavior of --dirstat can be customized by @@ -758,7 +759,7 @@ Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.

    -
    <limit>
    +
    <limit>

    An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes @@ -775,40 +776,40 @@ and accumulating child directory counts in the parent directories: --dirstat=files,10,cumulative.

    -
    --cumulative
    +
    --cumulative
    -

    Synonym for --dirstat=cumulative

    +

    Synonym for --dirstat=cumulative.

    -
    --dirstat-by-file[=<param1,param2>…​]
    +
    --dirstat-by-file[=<param>,...]
    -

    Synonym for --dirstat=files,<param1>,<param2>…​

    +

    Synonym for --dirstat=files,<param>,....

    -
    --summary
    +
    --summary

    Output a condensed summary of extended header information such as creations, renames and mode changes.

    -
    --no-renames
    +
    --no-renames

    Turn off rename detection, even when the configuration file gives the default to do so.

    -
    --[no-]rename-empty
    +
    --[no-]rename-empty

    Whether to use empty blobs as rename source.

    -
    --full-index
    +
    --full-index

    Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output.

    -
    --binary
    +
    --binary

    In addition to --full-index, output a binary diff that can be applied with git-apply.

    -
    --abbrev[=<n>]
    +
    --abbrev[=<n>]

    Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header @@ -819,8 +820,8 @@ precedence, i.e. if --full-index is specified, full blob names will be shown regardless of --abbrev. Non default number of digits can be specified with --abbrev=<n>.

    -
    -B[<n>][/<m>]
    -
    --break-rewrites[=[<n>][/<m>]]
    +
    -B[<n>][/<m>]
    +
    --break-rewrites[=[<n>][/<m>]]

    Break complete rewrite changes into pairs of delete and create. This serves two purposes:

    @@ -829,27 +830,27 @@ create. This serves two purposes:

    not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of -everything new, and the number m controls this aspect of the -B +everything new, and the number <m> controls this aspect of the -B option (defaults to 60%). -B/70% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).

    -

    When used with -M, a totally-rewritten file is also considered as the -source of a rename (usually -M only considers a file that disappeared -as the source of a rename), and the number n controls this aspect of -the -B option (defaults to 50%). -B20% specifies that a change with +

    When used with -M, a totally-rewritten file is also considered as the +source of a rename (usually -M only considers a file that disappeared +as the source of a rename), and the number <n> controls this aspect of +the -B option (defaults to 50%). -B20% specifies that a change with addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.

    -
    -M[<n>]
    -
    --find-renames[=<n>]
    +
    -M[<n>]
    +
    --find-renames[=<n>]

    Detect renames. -If n is specified, it is a threshold on the similarity +If <n> is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file’s size). For example, -M90% means Git should consider a delete/add pair to be a rename if more than 90% of the file @@ -859,13 +860,13 @@ a fraction, with a decimal point before it. I.e., -M5 becomes the same as -M5%. To limit detection to exact renames, use -M100%. The default similarity index is 50%.

    -
    -C[<n>]
    -
    --find-copies[=<n>]
    +
    -C[<n>]
    +
    --find-copies[=<n>]

    Detect copies as well as renames. See also --find-copies-harder. -If n is specified, it has the same meaning as for -M<n>.

    +If <n> is specified, it has the same meaning as for -M<n>.

    -
    --find-copies-harder
    +
    --find-copies-harder

    For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same @@ -875,8 +876,8 @@ copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one -C option has the same effect.

    -
    -D
    -
    --irreversible-delete
    +
    -D
    +
    --irreversible-delete

    Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and /dev/null. The resulting patch @@ -890,7 +891,7 @@ hence the name of the option.

    of a delete/create pair.

    -
    -l<num>
    +
    -l<num>

    The -M and -C options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an @@ -901,10 +902,10 @@ original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved -exceeds the specified number. Defaults to diff.renameLimit. +exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited.

    -
    -O<orderfile>
    +
    -O<orderfile>

    Control the order in which files appear in the output. This overrides the diff.orderFile configuration variable @@ -912,7 +913,7 @@ This overrides the diff.orderFile configuration variable use -O/dev/null.

    The output order is determined by the order of glob patterns in -<orderfile>. +<orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. @@ -924,7 +925,7 @@ but no earlier patterns), their output order relative to each other is the normal order.

    -

    <orderfile> is parsed as follows:

    +

    <orderfile> is parsed as follows:

    @@ -948,97 +949,97 @@ pattern if it starts with a hash.

    Patterns have the same syntax and semantics as patterns used for -fnmatch(3) without the FNM_PATHNAME flag, except a pathname also +fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "foo*bar" matches "fooasdfbar" and "foo/bar/baz/asdf" but not "foobarx".

    -
    --skip-to=<file>
    -
    --rotate-to=<file>
    +
    --skip-to=<file>
    +
    --rotate-to=<file>
    -

    Discard the files before the named <file> from the output +

    Discard the files before the named <file> from the output (i.e. skip to), or move them to the end of the output (i.e. rotate to). These options were invented primarily for the use of the git difftool command, and may not be very useful otherwise.

    -
    --relative[=<path>]
    -
    --no-relative
    +
    --relative[=<path>]
    +
    --no-relative

    When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative -to by giving a <path> as an argument. +to by giving a <path> as an argument. --no-relative can be used to countermand both diff.relative config option and previous --relative.

    -
    -a
    -
    --text
    +
    -a
    +
    --text

    Treat all files as text.

    -
    --ignore-cr-at-eol
    +
    --ignore-cr-at-eol

    Ignore carriage-return at the end of line when doing a comparison.

    -
    --ignore-space-at-eol
    +
    --ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    -b
    -
    --ignore-space-change
    +
    -b
    +
    --ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    -w
    -
    --ignore-all-space
    +
    -w
    +
    --ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    --ignore-blank-lines
    +
    --ignore-blank-lines

    Ignore changes whose lines are all blank.

    -
    -I<regex>
    -
    --ignore-matching-lines=<regex>
    +
    -I<regex>
    +
    --ignore-matching-lines=<regex>
    -

    Ignore changes whose all lines match <regex>. This option may +

    Ignore changes whose all lines match <regex>. This option may be specified more than once.

    -
    --inter-hunk-context=<lines>
    +
    --inter-hunk-context=<number>
    -

    Show the context between diff hunks, up to the specified number +

    Show the context between diff hunks, up to the specified <number> of lines, thereby fusing hunks that are close to each other. Defaults to diff.interHunkContext or 0 if the config option is unset.

    -
    -W
    -
    --function-context
    +
    -W
    +
    --function-context

    Show whole function as context lines for each change. The function names are determined in the same way as -git diff works out patch hunk headers (see Defining a -custom hunk-header in gitattributes(5)).

    +git diff works out patch hunk headers (see "Defining a +custom hunk-header" in gitattributes(5)).

    -
    --ext-diff
    +
    --ext-diff

    Allow an external diff helper to be executed. If you set an external diff driver with gitattributes(5), you need to use this option with git-log(1) and friends.

    -
    --no-ext-diff
    +
    --no-ext-diff

    Disallow external diff drivers.

    -
    --textconv
    -
    --no-textconv
    +
    --textconv
    +
    --no-textconv

    Allow (or disallow) external text conversion filters to be run when comparing binary files. See gitattributes(5) for @@ -1049,49 +1050,48 @@ filters are enabled by default only for git-diff(1) git-log(1), but not for git-format-patch(1) or diff plumbing commands.

    -
    --ignore-submodules[=<when>]
    +
    --ignore-submodules[=(none|untracked|dirty|all)]
    -

    Ignore changes to submodules in the diff generation. <when> can be -either "none", "untracked", "dirty" or "all", which is the default. -Using "none" will consider the submodule modified when it either contains -untracked or modified files or its HEAD differs from the commit recorded +

    Ignore changes to submodules in the diff generation. all is the default. +Using none will consider the submodule modified when it either contains +untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the -ignore option in git-config(1) or gitmodules(5). When -"untracked" is used submodules are not considered dirty when they only +ignore option in git-config(1) or gitmodules(5). When +untracked is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified -content). Using "dirty" ignores all changes to the work tree of submodules, +content). Using dirty ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was -the behavior until 1.7.0). Using "all" hides all changes to submodules.

    +the behavior until 1.7.0). Using all hides all changes to submodules.

    -
    --src-prefix=<prefix>
    +
    --src-prefix=<prefix>
    -

    Show the given source prefix instead of "a/".

    +

    Show the given source <prefix> instead of "a/".

    -
    --dst-prefix=<prefix>
    +
    --dst-prefix=<prefix>
    -

    Show the given destination prefix instead of "b/".

    +

    Show the given destination <prefix> instead of "b/".

    -
    --no-prefix
    +
    --no-prefix

    Do not show any source or destination prefix.

    -
    --default-prefix
    +
    --default-prefix

    Use the default source and destination prefixes ("a/" and "b/"). This overrides configuration variables such as diff.noprefix, diff.srcPrefix, diff.dstPrefix, and diff.mnemonicPrefix -(see git-config(1)).

    +(see git-config(1)).

    -
    --line-prefix=<prefix>
    +
    --line-prefix=<prefix>
    -

    Prepend an additional prefix to every line of output.

    +

    Prepend an additional <prefix> to every line of output.

    -
    --ita-invisible-in-index
    +
    --ita-invisible-in-index
    -

    By default entries added by "git add -N" appear as an existing -empty file in "git diff" and a new file in "git diff --cached". -This option makes the entry appear as a new file in "git diff" -and non-existent in "git diff --cached". This option could be +

    By default entries added by git add -N appear as an existing +empty file in git diff and a new file in git diff --cached. +This option makes the entry appear as a new file in git diff +and non-existent in git diff --cached. This option could be reverted with --ita-visible-in-index. Both options are experimental and could be removed in future.

    @@ -1986,7 +1986,7 @@ merge commit.

    diff --git a/git-fsck.html b/git-fsck.html index 550bcbe0..58462c18 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -768,6 +768,10 @@ by setting the corresponding fsck.<msg-id> configura

    (ERROR) A commit object has a bad parent sha1.

    +
    badRefContent
    +
    +

    (ERROR) A ref has bad content.

    +
    badRefFiletype

    (ERROR) A ref has a bad file type.

    @@ -776,6 +780,10 @@ by setting the corresponding fsck.<msg-id> configura

    (ERROR) A ref has an invalid format.

    +
    badReferentName
    +
    +

    (ERROR) The referent name of a symref is invalid.

    +
    badTagName

    (INFO) A tag has an invalid format.

    @@ -972,6 +980,39 @@ default value is 4096.

    (WARN) Tree contains entries pointing to a null sha1.

    +
    refMissingNewline
    +
    +

    (INFO) A loose ref that does not end with newline(LF). As +valid implementations of Git never created such a loose ref +file, it may become an error in the future. Report to the +git@vger.kernel.org mailing list if you see this error, as +we need to know what tools created such a file.

    +
    +
    symlinkRef
    +
    +

    (INFO) A symbolic link is used as a symref. Report to the +git@vger.kernel.org mailing list if you see this error, as we +are assessing the feasibility of dropping the support to drop +creating symbolic links as symrefs.

    +
    +
    symrefTargetIsNotARef
    +
    +

    (INFO) The target of a symbolic reference points neither to +a root reference nor to a reference starting with "refs/". +Although we allow create a symref pointing to the referent which +is outside the "ref" by using git symbolic-ref, we may tighten +the rule in the future. Report to the git@vger.kernel.org +mailing list if you see this error, as we need to know what tools +created such a file.

    +
    +
    trailingRefContent
    +
    +

    (INFO) A loose ref has trailing content. As valid implementations +of Git never created such a loose ref file, it may become an +error in the future. Report to the git@vger.kernel.org mailing +list if you see this error, as we need to know what tools +created such a file.

    +
    treeNotSorted

    (ERROR) A tree is not properly sorted.

    @@ -1028,7 +1069,7 @@ default value is 4096.

    diff --git a/git-log.html b/git-log.html index b8fef616..10a1e8a2 100644 --- a/git-log.html +++ b/git-log.html @@ -2760,14 +2760,14 @@ the default format for merge commits.

    -
    -p
    -
    -u
    -
    --patch
    +
    -p
    +
    -u
    +
    --patch

    Generate patch (see Generating patch text with -p).

    -
    -s
    -
    --no-patch
    +
    -s
    +
    --no-patch

    Suppress all output from the diff machinery. Useful for commands like git show that show the patch by default to @@ -2777,33 +2777,33 @@ squelch their output, or to cancel the effect of options like

    -m

    Show diffs for merge commits in the default format. This is -similar to --diff-merges=on, except -m will +similar to --diff-merges=on, except -m will produce no output unless -p is given as well.

    -c

    Produce combined diff output for merge commits. -Shortcut for --diff-merges=combined -p.

    +Shortcut for --diff-merges=combined -p.

    --cc

    Produce dense combined diff output for merge commits. -Shortcut for --diff-merges=dense-combined -p.

    +Shortcut for --diff-merges=dense-combined -p.

    --dd

    Produce diff with respect to first parent for both merge and regular commits. -Shortcut for --diff-merges=first-parent -p.

    +Shortcut for --diff-merges=first-parent -p.

    --remerge-diff

    Produce remerge-diff output for merge commits. -Shortcut for --diff-merges=remerge -p.

    +Shortcut for --diff-merges=remerge -p.

    --no-diff-merges
    -

    Synonym for --diff-merges=off.

    +

    Synonym for --diff-merges=off.

    --diff-merges=<format>
    @@ -2872,32 +2872,32 @@ documented).

    --combined-all-paths
    -

    This flag causes combined diffs (used for merge commits) to +

    Cause combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when --diff-merges=[dense-]combined is in use, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested).

    -
    -U<n>
    -
    --unified=<n>
    +
    -U<n>
    +
    --unified=<n>
    -

    Generate diffs with <n> lines of context instead of +

    Generate diffs with <n> lines of context instead of the usual three. Implies --patch.

    -
    --output=<file>
    +
    --output=<file>

    Output to a specific file instead of stdout.

    -
    --output-indicator-new=<char>
    -
    --output-indicator-old=<char>
    -
    --output-indicator-context=<char>
    +
    --output-indicator-new=<char>
    +
    --output-indicator-old=<char>
    +
    --output-indicator-context=<char>

    Specify the character used to indicate new, old or context -lines in the generated patch. Normally they are +, - and +lines in the generated patch. Normally they are +, - and ' ' respectively.

    -
    --raw
    +
    --raw

    For each commit, show a summary of changes using the raw diff format. See the "RAW OUTPUT FORMAT" section of @@ -2905,37 +2905,37 @@ format. See the "RAW OUTPUT FORMAT" section of itself in raw format, which you can achieve with --format=raw.

    -
    --patch-with-raw
    +
    --patch-with-raw

    Synonym for -p --raw.

    -
    -t
    +
    -t

    Show the tree objects in the diff output.

    -
    --indent-heuristic
    +
    --indent-heuristic

    Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default.

    -
    --no-indent-heuristic
    +
    --no-indent-heuristic

    Disable the indent heuristic.

    -
    --minimal
    +
    --minimal

    Spend extra time to make sure the smallest possible diff is produced.

    -
    --patience
    +
    --patience

    Generate a diff using the "patience diff" algorithm.

    -
    --histogram
    +
    --histogram

    Generate a diff using the "histogram diff" algorithm.

    -
    --anchored=<text>
    +
    --anchored=<text>

    Generate a diff using the "anchored diff" algorithm.

    @@ -2943,19 +2943,20 @@ diff is produced.

    If a line exists in both the source and destination, exists only once, -and starts with this text, this algorithm attempts to prevent it from +and starts with <text>, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the "patience diff" algorithm internally.

    -
    --diff-algorithm={patience|minimal|histogram|myers}
    +
    --diff-algorithm=(patience|minimal|histogram|myers)

    Choose a diff algorithm. The variants are as follows:

    -
    default, myers
    +
    default
    +
    myers

    The basic greedy diff algorithm. Currently, this is the default.

    @@ -2983,7 +2984,7 @@ non-default value and want to use the default one, then you have to use --diff-algorithm=default option.

    -
    --stat[=<width>[,<name-width>[,<count>]]]
    +
    --stat[=<width>[,<name-width>[,<count>]]]

    Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph @@ -2991,9 +2992,9 @@ part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by giving another width <name-width> after a comma or by setting -diff.statNameWidth=<width>. The width of the graph part can be -limited by using --stat-graph-width=<width> or by setting -diff.statGraphWidth=<width>. Using --stat or +diff.statNameWidth=<name-width>. The width of the graph part can be +limited by using --stat-graph-width=<graph-width> or by setting +diff.statGraphWidth=<graph-width>. Using --stat or --stat-graph-width affects all commands generating a stat graph, while setting diff.statNameWidth or diff.statGraphWidth does not affect git format-patch. @@ -3004,16 +3005,16 @@ the first <count> lines, followed by ... if there are more.

    --stat-name-width=<name-width> and --stat-count=<count>.

    -
    --compact-summary
    +
    --compact-summary

    Output a condensed summary of extended header information such -as file creations or deletions ("new" or "gone", optionally "+l" -if it’s a symlink) and mode changes ("+x" or "-x" for adding +as file creations or deletions ("new" or "gone", optionally +l +if it’s a symlink) and mode changes (+x or -x for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies --stat.

    -
    --numstat
    +
    --numstat

    Similar to --stat, but shows number of added and deleted lines in decimal notation and pathname without @@ -3021,14 +3022,14 @@ abbreviation, to make it more machine friendly. For binary files, outputs two - instead of saying 0 0.

    -
    --shortstat
    +
    --shortstat

    Output only the last line of the --stat format containing total number of modified files, as well as number of added and deleted lines.

    -
    -X[<param1,param2,…​>]
    -
    --dirstat[=<param1,param2,…​>]
    +
    -X [<param>,...]
    +
    --dirstat[=<param>,...]

    Output the distribution of relative amount of changes for each sub-directory. The behavior of --dirstat can be customized by @@ -3072,7 +3073,7 @@ Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.

    -
    <limit>
    +
    <limit>

    An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes @@ -3089,29 +3090,29 @@ and accumulating child directory counts in the parent directories: --dirstat=files,10,cumulative.

    -
    --cumulative
    +
    --cumulative
    -

    Synonym for --dirstat=cumulative

    +

    Synonym for --dirstat=cumulative.

    -
    --dirstat-by-file[=<param1,param2>…​]
    +
    --dirstat-by-file[=<param>,...]
    -

    Synonym for --dirstat=files,<param1>,<param2>…​

    +

    Synonym for --dirstat=files,<param>,....

    -
    --summary
    +
    --summary

    Output a condensed summary of extended header information such as creations, renames and mode changes.

    -
    --patch-with-stat
    +
    --patch-with-stat

    Synonym for -p --stat.

    -
    -z
    +
    -z
    -

    Separate the commits with NULs instead of newlines.

    +

    Separate the commits with NULs instead of newlines.

    Also, when --raw or --numstat has been given, do not munge -pathnames and use NULs as output field terminators.

    +pathnames and use NULs as output field terminators.

    Without this option, pathnames with "unusual" characters are quoted as @@ -3119,88 +3120,88 @@ explained for the configuration variable core.quotePath (see git-config(1)).

    -
    --name-only
    +
    --name-only

    Show only the name of each changed file in the post-image tree. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the git-log(1) manual page.

    -
    --name-status
    +
    --name-status

    Show only the name(s) and status of each changed file. See the description of the --diff-filter option on what the status letters mean. Just like --name-only the file names are often encoded in UTF-8.

    -
    --submodule[=<format>]
    +
    --submodule[=<format>]

    Specify how differences in submodules are shown. When specifying ---submodule=short the short format is used. This format just +--submodule=short the short format is used. This format just shows the names of the commits at the beginning and end of the range. -When --submodule or --submodule=log is specified, the log +When --submodule or --submodule=log is specified, the log format is used. This format lists the commits in the range like git-submodule(1) summary does. When --submodule=diff -is specified, the diff format is used. This format shows an +is specified, the diff format is used. This format shows an inline diff of the changes in the submodule contents between the -commit range. Defaults to diff.submodule or the short format +commit range. Defaults to diff.submodule or the short format if the config option is unset.

    -
    --color[=<when>]
    +
    --color[=<when>]

    Show colored diff. ---color (i.e. without =<when>) is the same as --color=always. +--color (i.e. without =<when>) is the same as --color=always. <when> can be one of always, never, or auto.

    -
    --no-color
    +
    --no-color

    Turn off colored diff. It is the same as --color=never.

    -
    --color-moved[=<mode>]
    +
    --color-moved[=<mode>]

    Moved lines of code are colored differently. -The <mode> defaults to no if the option is not given -and to zebra if the option with no mode is given. +The <mode> defaults to no if the option is not given +and to zebra if the option with no mode is given. The mode must be one of:

    -
    no
    +
    no

    Moved lines are not highlighted.

    -
    default
    +
    default

    Is a synonym for zebra. This may change to a more sensible mode in the future.

    -
    plain
    +
    plain

    Any line that is added in one location and was removed -in another location will be colored with color.diff.newMoved. -Similarly color.diff.oldMoved will be used for removed lines +in another location will be colored with color.diff.newMoved. +Similarly color.diff.oldMoved will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation.

    -
    blocks
    +
    blocks

    Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are -painted using either the color.diff.{old,new}Moved color. +painted using either the color.diff.(old|new)Moved color. Adjacent blocks cannot be told apart.

    -
    zebra
    +
    zebra
    -

    Blocks of moved text are detected as in blocks mode. The blocks -are painted using either the color.diff.{old,new}Moved color or -color.diff.{old,new}MovedAlternative. The change between +

    Blocks of moved text are detected as in blocks mode. The blocks +are painted using either the color.diff.(old|new)Moved color or +color.diff.(old|new)MovedAlternative. The change between the two colors indicates that a new block was detected.

    -
    dimmed-zebra
    +
    dimmed-zebra
    -

    Similar to zebra, but additional dimming of uninteresting parts +

    Similar to zebra, but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. dimmed_zebra is a deprecated synonym.

    @@ -3210,12 +3211,12 @@ blocks are considered interesting, the rest is uninteresting.
    -
    --no-color-moved
    +
    --no-color-moved

    Turn off move detection. This can be used to override configuration settings. It is the same as --color-moved=no.

    -
    --color-moved-ws=<modes>
    +
    --color-moved-ws=<mode>,...

    This configures how whitespace is ignored when performing the move detection for --color-moved. @@ -3224,26 +3225,26 @@ These modes can be given as a comma separated list:

    -
    no
    +
    no

    Do not ignore whitespace when performing move detection.

    -
    ignore-space-at-eol
    +
    ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    ignore-space-change
    +
    ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    ignore-all-space
    +
    ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    allow-indentation-change
    +
    allow-indentation-change

    Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in @@ -3255,33 +3256,32 @@ other modes.

    -
    --no-color-moved-ws
    +
    --no-color-moved-ws

    Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as --color-moved-ws=no.

    -
    --word-diff[=<mode>]
    +
    --word-diff[=<mode>]
    -

    Show a word diff, using the <mode> to delimit changed words. -By default, words are delimited by whitespace; see ---word-diff-regex below. The <mode> defaults to plain, and +

    By default, words are delimited by whitespace; see +--word-diff-regex below. The <mode> defaults to plain, and must be one of:

    -
    color
    +
    color

    Highlight changed words using only colors. Implies --color.

    -
    plain
    +
    plain
    -

    Show words as [-removed-] and {+added+}. Makes no +

    Show words as [-removed-] and {added}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.

    -
    porcelain
    +
    porcelain

    Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the @@ -3290,7 +3290,7 @@ character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde ~ on a line of its own.

    -
    none
    +
    none

    Disable word diff again.

    @@ -3303,14 +3303,14 @@ tilde ~ on a line of its own.

    highlight the changed parts in all modes if enabled.

    -
    --word-diff-regex=<regex>
    +
    --word-diff-regex=<regex>
    -

    Use <regex> to decide what a word is, instead of considering +

    Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies --word-diff unless it was already enabled.

    Every non-overlapping match of the -<regex> is considered a word. Anything between these matches is +<regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append |[^[:space:]] to your regular expression to make sure that it matches all non-whitespace characters. @@ -3328,21 +3328,21 @@ overrides any diff driver or configuration setting. Diff drivers override configuration settings.

    -
    --color-words[=<regex>]
    +
    --color-words[=<regex>]

    Equivalent to --word-diff=color plus (if a regex was specified) --word-diff-regex=<regex>.

    -
    --no-renames
    +
    --no-renames

    Turn off rename detection, even when the configuration file gives the default to do so.

    -
    --[no-]rename-empty
    +
    --[no-]rename-empty

    Whether to use empty blobs as rename source.

    -
    --check
    +
    --check

    Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by core.whitespace @@ -3351,9 +3351,9 @@ lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible -with --exit-code.

    +with --exit-code.

    -
    --ws-error-highlight=<kind>
    +
    --ws-error-highlight=<kind>

    Highlight whitespace errors in the context, old or new lines of the diff. Multiple values are separated by comma, @@ -3364,19 +3364,19 @@ this option is not given, and the configuration variable new lines are highlighted. The whitespace errors are colored with color.diff.whitespace.

    -
    --full-index
    +
    --full-index

    Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output.

    -
    --binary
    +
    --binary

    In addition to --full-index, output a binary diff that can be applied with git-apply. Implies --patch.

    -
    --abbrev[=<n>]
    +
    --abbrev[=<n>]

    Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header @@ -3387,8 +3387,8 @@ precedence, i.e. if --full-index is specified, full blob names will be shown regardless of --abbrev. Non default number of digits can be specified with --abbrev=<n>.

    -
    -B[<n>][/<m>]
    -
    --break-rewrites[=[<n>][/<m>]]
    +
    -B[<n>][/<m>]
    +
    --break-rewrites[=[<n>][/<m>]]

    Break complete rewrite changes into pairs of delete and create. This serves two purposes:

    @@ -3397,29 +3397,29 @@ create. This serves two purposes:

    not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of -everything new, and the number m controls this aspect of the -B +everything new, and the number <m> controls this aspect of the -B option (defaults to 60%). -B/70% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).

    -

    When used with -M, a totally-rewritten file is also considered as the -source of a rename (usually -M only considers a file that disappeared -as the source of a rename), and the number n controls this aspect of -the -B option (defaults to 50%). -B20% specifies that a change with +

    When used with -M, a totally-rewritten file is also considered as the +source of a rename (usually -M only considers a file that disappeared +as the source of a rename), and the number <n> controls this aspect of +the -B option (defaults to 50%). -B20% specifies that a change with addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.

    -
    -M[<n>]
    -
    --find-renames[=<n>]
    +
    -M[<n>]
    +
    --find-renames[=<n>]

    If generating diffs, detect and report renames for each commit. For following files across renames while traversing history, see --follow. -If n is specified, it is a threshold on the similarity +If <n> is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file’s size). For example, -M90% means Git should consider a delete/add pair to be a rename if more than 90% of the file @@ -3429,13 +3429,13 @@ a fraction, with a decimal point before it. I.e., -M5 becomes the same as -M5%. To limit detection to exact renames, use -M100%. The default similarity index is 50%.

    -
    -C[<n>]
    -
    --find-copies[=<n>]
    +
    -C[<n>]
    +
    --find-copies[=<n>]

    Detect copies as well as renames. See also --find-copies-harder. -If n is specified, it has the same meaning as for -M<n>.

    +If <n> is specified, it has the same meaning as for -M<n>.

    -
    --find-copies-harder
    +
    --find-copies-harder

    For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same @@ -3445,8 +3445,8 @@ copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one -C option has the same effect.

    -
    -D
    -
    --irreversible-delete
    +
    -D
    +
    --irreversible-delete

    Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and /dev/null. The resulting patch @@ -3460,7 +3460,7 @@ hence the name of the option.

    of a delete/create pair.

    -
    -l<num>
    +
    -l<num>

    The -M and -C options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an @@ -3471,10 +3471,10 @@ original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved -exceeds the specified number. Defaults to diff.renameLimit. +exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited.

    -
    --diff-filter=[(A|C|D|M|R|T|U|X|B)…​[*]]
    +
    --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]

    Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their @@ -3495,10 +3495,10 @@ that matches other criteria, nothing is selected.

    renamed entries cannot appear if detection for those types is disabled.

    -
    -S<string>
    +
    -S<string>

    Look for differences that change the number of occurrences of -the specified string (i.e. addition/deletion) in a file. +the specified <string> (i.e. addition/deletion) in a file. Intended for the scripter’s use.

    It is useful when you’re looking for an exact block of code (like a @@ -3511,10 +3511,10 @@ very first version of the block.

    Binary files are searched as well.

    -
    -G<regex>
    +
    -G<regex>

    Look for differences whose patch text contains added/removed -lines that match <regex>.

    +lines that match <regex>.

    To illustrate the difference between -S<regex> --pickaxe-regex and -G<regex>, consider a commit with the following diff in the same @@ -3541,7 +3541,7 @@ filter will be ignored.

    information.

    -
    --find-object=<object-id>
    +
    --find-object=<object-id>

    Look for differences that change the number of occurrences of the specified object. Similar to -S, just the argument is different @@ -3552,18 +3552,18 @@ object id.

    git-log to also find trees.

    -
    --pickaxe-all
    +
    --pickaxe-all

    When -S or -G finds a change, show all the changes in that changeset, not just the files that contain the change -in <string>.

    +in <string>.

    -
    --pickaxe-regex
    +
    --pickaxe-regex
    -

    Treat the <string> given to -S as an extended POSIX regular +

    Treat the <string> given to -S as an extended POSIX regular expression to match.

    -
    -O<orderfile>
    +
    -O<orderfile>

    Control the order in which files appear in the output. This overrides the diff.orderFile configuration variable @@ -3571,7 +3571,7 @@ This overrides the diff.orderFile configuration variable use -O/dev/null.

    The output order is determined by the order of glob patterns in -<orderfile>. +<orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. @@ -3583,7 +3583,7 @@ but no earlier patterns), their output order relative to each other is the normal order.

    -

    <orderfile> is parsed as follows:

    +

    <orderfile> is parsed as follows:

    @@ -3607,102 +3607,102 @@ pattern if it starts with a hash.

    Patterns have the same syntax and semantics as patterns used for -fnmatch(3) without the FNM_PATHNAME flag, except a pathname also +fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "foo*bar" matches "fooasdfbar" and "foo/bar/baz/asdf" but not "foobarx".

    -
    --skip-to=<file>
    -
    --rotate-to=<file>
    +
    --skip-to=<file>
    +
    --rotate-to=<file>
    -

    Discard the files before the named <file> from the output +

    Discard the files before the named <file> from the output (i.e. skip to), or move them to the end of the output (i.e. rotate to). These options were invented primarily for the use of the git difftool command, and may not be very useful otherwise.

    -
    -R
    +
    -R

    Swap two inputs; that is, show differences from index or on-disk file to tree contents.

    -
    --relative[=<path>]
    -
    --no-relative
    +
    --relative[=<path>]
    +
    --no-relative

    When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative -to by giving a <path> as an argument. +to by giving a <path> as an argument. --no-relative can be used to countermand both diff.relative config option and previous --relative.

    -
    -a
    -
    --text
    +
    -a
    +
    --text

    Treat all files as text.

    -
    --ignore-cr-at-eol
    +
    --ignore-cr-at-eol

    Ignore carriage-return at the end of line when doing a comparison.

    -
    --ignore-space-at-eol
    +
    --ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    -b
    -
    --ignore-space-change
    +
    -b
    +
    --ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    -w
    -
    --ignore-all-space
    +
    -w
    +
    --ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    --ignore-blank-lines
    +
    --ignore-blank-lines

    Ignore changes whose lines are all blank.

    -
    -I<regex>
    -
    --ignore-matching-lines=<regex>
    +
    -I<regex>
    +
    --ignore-matching-lines=<regex>
    -

    Ignore changes whose all lines match <regex>. This option may +

    Ignore changes whose all lines match <regex>. This option may be specified more than once.

    -
    --inter-hunk-context=<lines>
    +
    --inter-hunk-context=<number>
    -

    Show the context between diff hunks, up to the specified number +

    Show the context between diff hunks, up to the specified <number> of lines, thereby fusing hunks that are close to each other. Defaults to diff.interHunkContext or 0 if the config option is unset.

    -
    -W
    -
    --function-context
    +
    -W
    +
    --function-context

    Show whole function as context lines for each change. The function names are determined in the same way as -git diff works out patch hunk headers (see Defining a -custom hunk-header in gitattributes(5)).

    +git diff works out patch hunk headers (see "Defining a +custom hunk-header" in gitattributes(5)).

    -
    --ext-diff
    +
    --ext-diff

    Allow an external diff helper to be executed. If you set an external diff driver with gitattributes(5), you need to use this option with git-log(1) and friends.

    -
    --no-ext-diff
    +
    --no-ext-diff

    Disallow external diff drivers.

    -
    --textconv
    -
    --no-textconv
    +
    --textconv
    +
    --no-textconv

    Allow (or disallow) external text conversion filters to be run when comparing binary files. See gitattributes(5) for @@ -3713,49 +3713,48 @@ filters are enabled by default only for git-diff(1) git-log(1), but not for git-format-patch(1) or diff plumbing commands.

    -
    --ignore-submodules[=<when>]
    +
    --ignore-submodules[=(none|untracked|dirty|all)]
    -

    Ignore changes to submodules in the diff generation. <when> can be -either "none", "untracked", "dirty" or "all", which is the default. -Using "none" will consider the submodule modified when it either contains -untracked or modified files or its HEAD differs from the commit recorded +

    Ignore changes to submodules in the diff generation. all is the default. +Using none will consider the submodule modified when it either contains +untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the -ignore option in git-config(1) or gitmodules(5). When -"untracked" is used submodules are not considered dirty when they only +ignore option in git-config(1) or gitmodules(5). When +untracked is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified -content). Using "dirty" ignores all changes to the work tree of submodules, +content). Using dirty ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was -the behavior until 1.7.0). Using "all" hides all changes to submodules.

    +the behavior until 1.7.0). Using all hides all changes to submodules.

    -
    --src-prefix=<prefix>
    +
    --src-prefix=<prefix>
    -

    Show the given source prefix instead of "a/".

    +

    Show the given source <prefix> instead of "a/".

    -
    --dst-prefix=<prefix>
    +
    --dst-prefix=<prefix>
    -

    Show the given destination prefix instead of "b/".

    +

    Show the given destination <prefix> instead of "b/".

    -
    --no-prefix
    +
    --no-prefix

    Do not show any source or destination prefix.

    -
    --default-prefix
    +
    --default-prefix

    Use the default source and destination prefixes ("a/" and "b/"). This overrides configuration variables such as diff.noprefix, diff.srcPrefix, diff.dstPrefix, and diff.mnemonicPrefix -(see git-config(1)).

    +(see git-config(1)).

    -
    --line-prefix=<prefix>
    +
    --line-prefix=<prefix>
    -

    Prepend an additional prefix to every line of output.

    +

    Prepend an additional <prefix> to every line of output.

    -
    --ita-invisible-in-index
    +
    --ita-invisible-in-index
    -

    By default entries added by "git add -N" appear as an existing -empty file in "git diff" and a new file in "git diff --cached". -This option makes the entry appear as a new file in "git diff" -and non-existent in "git diff --cached". This option could be +

    By default entries added by git add -N appear as an existing +empty file in git diff and a new file in git diff --cached. +This option makes the entry appear as a new file in git diff +and non-existent in git diff --cached. This option could be reverted with --ita-visible-in-index. Both options are experimental and could be removed in future.

    @@ -3784,7 +3783,7 @@ You can customize the creation of patch text via the (see git(1)), and the diff attribute (see gitattributes(5)).

    -

    What the -p option produces is slightly different from the traditional +

    What the -p option produces is slightly different from the traditional diff format:

    @@ -3809,23 +3808,21 @@ the file that the rename/copy produces, respectively.

  • It is followed by one or more extended header lines:

    -
    -
    -
    old mode <mode>
-new mode <mode>
-deleted file mode <mode>
-new file mode <mode>
-copy from <path>
-copy to <path>
-rename from <path>
-rename to <path>
-similarity index <number>
-dissimilarity index <number>
-index <hash>..<hash> <mode>
    -
    -
    -
    -

    File modes are printed as 6-digit octal numbers including the file type +

    +
    old mode <mode>
+new mode <mode>
+deleted file mode <mode>
+new file mode <mode>
+copy from <path>
+copy to <path>
+rename from <path>
+rename to <path>
+similarity index <number>
+dissimilarity index <number>
+index <hash>`..`<hash> <mode>
    +
    +
    +

    File modes <mode> are printed as 6-digit octal numbers including the file type and file permission bits.

    @@ -3841,7 +3838,7 @@ file made it into the new one.

    The index line includes the blob object names before and after the change. -The <mode> is included if the file mode does not change; otherwise, +The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode.

    • @@ -3943,20 +3940,18 @@ this (when the -c option is used):

  • It is followed by one or more extended header lines (this example shows a merge with two parents):

    -
    -
    -
    index <hash>,<hash>..<hash>
-mode <mode>,<mode>..<mode>
-new file mode <mode>
-deleted file mode <mode>,<mode>
    -
    +
    +
    index <hash>,<hash>`..__<hash>__
+{empty}`mode <mode>,<mode>``..``<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>

    The mode <mode>,<mode>..<mode> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two -<tree-ish> and are not used by combined diff format.

    +<tree-ish> and are not used by combined diff format.

  • @@ -4408,7 +4403,7 @@ See notes.rewrite.<command> above for a further desc
    • diff --git a/git-remote-helpers.html b/git-remote-helpers.html index 911bae04..3604d58b 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -442,7 +442,7 @@ pre>code {
    diff --git a/git-show.html b/git-show.html index 6e16c3de..a8649f5d 100644 --- a/git-show.html +++ b/git-show.html @@ -1393,14 +1393,14 @@ diff output.

    -
    -p
    -
    -u
    -
    --patch
    +
    -p
    +
    -u
    +
    --patch

    Generate patch (see Generating patch text with -p).

    -
    -s
    -
    --no-patch
    +
    -s
    +
    --no-patch

    Suppress all output from the diff machinery. Useful for commands like git show that show the patch by default to @@ -1410,33 +1410,33 @@ squelch their output, or to cancel the effect of options like

    -m

    Show diffs for merge commits in the default format. This is -similar to --diff-merges=on, except -m will +similar to --diff-merges=on, except -m will produce no output unless -p is given as well.

    -c

    Produce combined diff output for merge commits. -Shortcut for --diff-merges=combined -p.

    +Shortcut for --diff-merges=combined -p.

    --cc

    Produce dense combined diff output for merge commits. -Shortcut for --diff-merges=dense-combined -p.

    +Shortcut for --diff-merges=dense-combined -p.

    --dd

    Produce diff with respect to first parent for both merge and regular commits. -Shortcut for --diff-merges=first-parent -p.

    +Shortcut for --diff-merges=first-parent -p.

    --remerge-diff

    Produce remerge-diff output for merge commits. -Shortcut for --diff-merges=remerge -p.

    +Shortcut for --diff-merges=remerge -p.

    --no-diff-merges
    -

    Synonym for --diff-merges=off.

    +

    Synonym for --diff-merges=off.

    --diff-merges=<format>
    @@ -1505,32 +1505,32 @@ documented).

    --combined-all-paths
    -

    This flag causes combined diffs (used for merge commits) to +

    Cause combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when --diff-merges=[dense-]combined is in use, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested).

    -
    -U<n>
    -
    --unified=<n>
    +
    -U<n>
    +
    --unified=<n>
    -

    Generate diffs with <n> lines of context instead of +

    Generate diffs with <n> lines of context instead of the usual three. Implies --patch.

    -
    --output=<file>
    +
    --output=<file>

    Output to a specific file instead of stdout.

    -
    --output-indicator-new=<char>
    -
    --output-indicator-old=<char>
    -
    --output-indicator-context=<char>
    +
    --output-indicator-new=<char>
    +
    --output-indicator-old=<char>
    +
    --output-indicator-context=<char>

    Specify the character used to indicate new, old or context -lines in the generated patch. Normally they are +, - and +lines in the generated patch. Normally they are +, - and ' ' respectively.

    -
    --raw
    +
    --raw

    For each commit, show a summary of changes using the raw diff format. See the "RAW OUTPUT FORMAT" section of @@ -1538,37 +1538,37 @@ format. See the "RAW OUTPUT FORMAT" section of itself in raw format, which you can achieve with --format=raw.

    -
    --patch-with-raw
    +
    --patch-with-raw

    Synonym for -p --raw.

    -
    -t
    +
    -t

    Show the tree objects in the diff output.

    -
    --indent-heuristic
    +
    --indent-heuristic

    Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default.

    -
    --no-indent-heuristic
    +
    --no-indent-heuristic

    Disable the indent heuristic.

    -
    --minimal
    +
    --minimal

    Spend extra time to make sure the smallest possible diff is produced.

    -
    --patience
    +
    --patience

    Generate a diff using the "patience diff" algorithm.

    -
    --histogram
    +
    --histogram

    Generate a diff using the "histogram diff" algorithm.

    -
    --anchored=<text>
    +
    --anchored=<text>

    Generate a diff using the "anchored diff" algorithm.

    @@ -1576,19 +1576,20 @@ diff is produced.

    If a line exists in both the source and destination, exists only once, -and starts with this text, this algorithm attempts to prevent it from +and starts with <text>, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the "patience diff" algorithm internally.

    -
    --diff-algorithm={patience|minimal|histogram|myers}
    +
    --diff-algorithm=(patience|minimal|histogram|myers)

    Choose a diff algorithm. The variants are as follows:

    -
    default, myers
    +
    default
    +
    myers

    The basic greedy diff algorithm. Currently, this is the default.

    @@ -1616,7 +1617,7 @@ non-default value and want to use the default one, then you have to use --diff-algorithm=default option.

    -
    --stat[=<width>[,<name-width>[,<count>]]]
    +
    --stat[=<width>[,<name-width>[,<count>]]]

    Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph @@ -1624,9 +1625,9 @@ part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by <width>. The width of the filename part can be limited by giving another width <name-width> after a comma or by setting -diff.statNameWidth=<width>. The width of the graph part can be -limited by using --stat-graph-width=<width> or by setting -diff.statGraphWidth=<width>. Using --stat or +diff.statNameWidth=<name-width>. The width of the graph part can be +limited by using --stat-graph-width=<graph-width> or by setting +diff.statGraphWidth=<graph-width>. Using --stat or --stat-graph-width affects all commands generating a stat graph, while setting diff.statNameWidth or diff.statGraphWidth does not affect git format-patch. @@ -1637,16 +1638,16 @@ the first <count> lines, followed by ... if there are more.

    --stat-name-width=<name-width> and --stat-count=<count>.

    -
    --compact-summary
    +
    --compact-summary

    Output a condensed summary of extended header information such -as file creations or deletions ("new" or "gone", optionally "+l" -if it’s a symlink) and mode changes ("+x" or "-x" for adding +as file creations or deletions ("new" or "gone", optionally +l +if it’s a symlink) and mode changes (+x or -x for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies --stat.

    -
    --numstat
    +
    --numstat

    Similar to --stat, but shows number of added and deleted lines in decimal notation and pathname without @@ -1654,14 +1655,14 @@ abbreviation, to make it more machine friendly. For binary files, outputs two - instead of saying 0 0.

    -
    --shortstat
    +
    --shortstat

    Output only the last line of the --stat format containing total number of modified files, as well as number of added and deleted lines.

    -
    -X[<param1,param2,…​>]
    -
    --dirstat[=<param1,param2,…​>]
    +
    -X [<param>,...]
    +
    --dirstat[=<param>,...]

    Output the distribution of relative amount of changes for each sub-directory. The behavior of --dirstat can be customized by @@ -1705,7 +1706,7 @@ Note that when using cumulative, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the noncumulative parameter.

    -
    <limit>
    +
    <limit>

    An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes @@ -1722,29 +1723,29 @@ and accumulating child directory counts in the parent directories: --dirstat=files,10,cumulative.

    -
    --cumulative
    +
    --cumulative
    -

    Synonym for --dirstat=cumulative

    +

    Synonym for --dirstat=cumulative.

    -
    --dirstat-by-file[=<param1,param2>…​]
    +
    --dirstat-by-file[=<param>,...]
    -

    Synonym for --dirstat=files,<param1>,<param2>…​

    +

    Synonym for --dirstat=files,<param>,....

    -
    --summary
    +
    --summary

    Output a condensed summary of extended header information such as creations, renames and mode changes.

    -
    --patch-with-stat
    +
    --patch-with-stat

    Synonym for -p --stat.

    -
    -z
    +
    -z
    -

    Separate the commits with NULs instead of newlines.

    +

    Separate the commits with NULs instead of newlines.

    Also, when --raw or --numstat has been given, do not munge -pathnames and use NULs as output field terminators.

    +pathnames and use NULs as output field terminators.

    Without this option, pathnames with "unusual" characters are quoted as @@ -1752,88 +1753,88 @@ explained for the configuration variable core.quotePath (see git-config(1)).

    -
    --name-only
    +
    --name-only

    Show only the name of each changed file in the post-image tree. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the git-log(1) manual page.

    -
    --name-status
    +
    --name-status

    Show only the name(s) and status of each changed file. See the description of the --diff-filter option on what the status letters mean. Just like --name-only the file names are often encoded in UTF-8.

    -
    --submodule[=<format>]
    +
    --submodule[=<format>]

    Specify how differences in submodules are shown. When specifying ---submodule=short the short format is used. This format just +--submodule=short the short format is used. This format just shows the names of the commits at the beginning and end of the range. -When --submodule or --submodule=log is specified, the log +When --submodule or --submodule=log is specified, the log format is used. This format lists the commits in the range like git-submodule(1) summary does. When --submodule=diff -is specified, the diff format is used. This format shows an +is specified, the diff format is used. This format shows an inline diff of the changes in the submodule contents between the -commit range. Defaults to diff.submodule or the short format +commit range. Defaults to diff.submodule or the short format if the config option is unset.

    -
    --color[=<when>]
    +
    --color[=<when>]

    Show colored diff. ---color (i.e. without =<when>) is the same as --color=always. +--color (i.e. without =<when>) is the same as --color=always. <when> can be one of always, never, or auto.

    -
    --no-color
    +
    --no-color

    Turn off colored diff. It is the same as --color=never.

    -
    --color-moved[=<mode>]
    +
    --color-moved[=<mode>]

    Moved lines of code are colored differently. -The <mode> defaults to no if the option is not given -and to zebra if the option with no mode is given. +The <mode> defaults to no if the option is not given +and to zebra if the option with no mode is given. The mode must be one of:

    -
    no
    +
    no

    Moved lines are not highlighted.

    -
    default
    +
    default

    Is a synonym for zebra. This may change to a more sensible mode in the future.

    -
    plain
    +
    plain

    Any line that is added in one location and was removed -in another location will be colored with color.diff.newMoved. -Similarly color.diff.oldMoved will be used for removed lines +in another location will be colored with color.diff.newMoved. +Similarly color.diff.oldMoved will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation.

    -
    blocks
    +
    blocks

    Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are -painted using either the color.diff.{old,new}Moved color. +painted using either the color.diff.(old|new)Moved color. Adjacent blocks cannot be told apart.

    -
    zebra
    +
    zebra
    -

    Blocks of moved text are detected as in blocks mode. The blocks -are painted using either the color.diff.{old,new}Moved color or -color.diff.{old,new}MovedAlternative. The change between +

    Blocks of moved text are detected as in blocks mode. The blocks +are painted using either the color.diff.(old|new)Moved color or +color.diff.(old|new)MovedAlternative. The change between the two colors indicates that a new block was detected.

    -
    dimmed-zebra
    +
    dimmed-zebra
    -

    Similar to zebra, but additional dimming of uninteresting parts +

    Similar to zebra, but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. dimmed_zebra is a deprecated synonym.

    @@ -1843,12 +1844,12 @@ blocks are considered interesting, the rest is uninteresting.
    -
    --no-color-moved
    +
    --no-color-moved

    Turn off move detection. This can be used to override configuration settings. It is the same as --color-moved=no.

    -
    --color-moved-ws=<modes>
    +
    --color-moved-ws=<mode>,...

    This configures how whitespace is ignored when performing the move detection for --color-moved. @@ -1857,26 +1858,26 @@ These modes can be given as a comma separated list:

    -
    no
    +
    no

    Do not ignore whitespace when performing move detection.

    -
    ignore-space-at-eol
    +
    ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    ignore-space-change
    +
    ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    ignore-all-space
    +
    ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    allow-indentation-change
    +
    allow-indentation-change

    Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in @@ -1888,33 +1889,32 @@ other modes.

    -
    --no-color-moved-ws
    +
    --no-color-moved-ws

    Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as --color-moved-ws=no.

    -
    --word-diff[=<mode>]
    +
    --word-diff[=<mode>]
    -

    Show a word diff, using the <mode> to delimit changed words. -By default, words are delimited by whitespace; see ---word-diff-regex below. The <mode> defaults to plain, and +

    By default, words are delimited by whitespace; see +--word-diff-regex below. The <mode> defaults to plain, and must be one of:

    -
    color
    +
    color

    Highlight changed words using only colors. Implies --color.

    -
    plain
    +
    plain
    -

    Show words as [-removed-] and {+added+}. Makes no +

    Show words as [-removed-] and {added}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.

    -
    porcelain
    +
    porcelain

    Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the @@ -1923,7 +1923,7 @@ character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde ~ on a line of its own.

    -
    none
    +
    none

    Disable word diff again.

    @@ -1936,14 +1936,14 @@ tilde ~ on a line of its own.

    highlight the changed parts in all modes if enabled.

    -
    --word-diff-regex=<regex>
    +
    --word-diff-regex=<regex>
    -

    Use <regex> to decide what a word is, instead of considering +

    Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies --word-diff unless it was already enabled.

    Every non-overlapping match of the -<regex> is considered a word. Anything between these matches is +<regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append |[^[:space:]] to your regular expression to make sure that it matches all non-whitespace characters. @@ -1961,21 +1961,21 @@ overrides any diff driver or configuration setting. Diff drivers override configuration settings.

    -
    --color-words[=<regex>]
    +
    --color-words[=<regex>]

    Equivalent to --word-diff=color plus (if a regex was specified) --word-diff-regex=<regex>.

    -
    --no-renames
    +
    --no-renames

    Turn off rename detection, even when the configuration file gives the default to do so.

    -
    --[no-]rename-empty
    +
    --[no-]rename-empty

    Whether to use empty blobs as rename source.

    -
    --check
    +
    --check

    Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by core.whitespace @@ -1984,9 +1984,9 @@ lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible -with --exit-code.

    +with --exit-code.

    -
    --ws-error-highlight=<kind>
    +
    --ws-error-highlight=<kind>

    Highlight whitespace errors in the context, old or new lines of the diff. Multiple values are separated by comma, @@ -1997,19 +1997,19 @@ this option is not given, and the configuration variable new lines are highlighted. The whitespace errors are colored with color.diff.whitespace.

    -
    --full-index
    +
    --full-index

    Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output.

    -
    --binary
    +
    --binary

    In addition to --full-index, output a binary diff that can be applied with git-apply. Implies --patch.

    -
    --abbrev[=<n>]
    +
    --abbrev[=<n>]

    Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header @@ -2020,8 +2020,8 @@ precedence, i.e. if --full-index is specified, full blob names will be shown regardless of --abbrev. Non default number of digits can be specified with --abbrev=<n>.

    -
    -B[<n>][/<m>]
    -
    --break-rewrites[=[<n>][/<m>]]
    +
    -B[<n>][/<m>]
    +
    --break-rewrites[=[<n>][/<m>]]

    Break complete rewrite changes into pairs of delete and create. This serves two purposes:

    @@ -2030,29 +2030,29 @@ create. This serves two purposes:

    not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of -everything new, and the number m controls this aspect of the -B +everything new, and the number <m> controls this aspect of the -B option (defaults to 60%). -B/70% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).

    -

    When used with -M, a totally-rewritten file is also considered as the -source of a rename (usually -M only considers a file that disappeared -as the source of a rename), and the number n controls this aspect of -the -B option (defaults to 50%). -B20% specifies that a change with +

    When used with -M, a totally-rewritten file is also considered as the +source of a rename (usually -M only considers a file that disappeared +as the source of a rename), and the number <n> controls this aspect of +the -B option (defaults to 50%). -B20% specifies that a change with addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.

    -
    -M[<n>]
    -
    --find-renames[=<n>]
    +
    -M[<n>]
    +
    --find-renames[=<n>]

    If generating diffs, detect and report renames for each commit. For following files across renames while traversing history, see --follow. -If n is specified, it is a threshold on the similarity +If <n> is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file’s size). For example, -M90% means Git should consider a delete/add pair to be a rename if more than 90% of the file @@ -2062,13 +2062,13 @@ a fraction, with a decimal point before it. I.e., -M5 becomes the same as -M5%. To limit detection to exact renames, use -M100%. The default similarity index is 50%.

    -
    -C[<n>]
    -
    --find-copies[=<n>]
    +
    -C[<n>]
    +
    --find-copies[=<n>]

    Detect copies as well as renames. See also --find-copies-harder. -If n is specified, it has the same meaning as for -M<n>.

    +If <n> is specified, it has the same meaning as for -M<n>.

    -
    --find-copies-harder
    +
    --find-copies-harder

    For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same @@ -2078,8 +2078,8 @@ copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one -C option has the same effect.

    -
    -D
    -
    --irreversible-delete
    +
    -D
    +
    --irreversible-delete

    Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and /dev/null. The resulting patch @@ -2093,7 +2093,7 @@ hence the name of the option.

    of a delete/create pair.

    -
    -l<num>
    +
    -l<num>

    The -M and -C options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an @@ -2104,10 +2104,10 @@ original sources are relevant.) For N sources and destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved -exceeds the specified number. Defaults to diff.renameLimit. +exceeds the specified number. Defaults to diff.renameLimit. Note that a value of 0 is treated as unlimited.

    -
    --diff-filter=[(A|C|D|M|R|T|U|X|B)…​[*]]
    +
    --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]

    Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their @@ -2128,10 +2128,10 @@ that matches other criteria, nothing is selected.

    renamed entries cannot appear if detection for those types is disabled.

    -
    -S<string>
    +
    -S<string>

    Look for differences that change the number of occurrences of -the specified string (i.e. addition/deletion) in a file. +the specified <string> (i.e. addition/deletion) in a file. Intended for the scripter’s use.

    It is useful when you’re looking for an exact block of code (like a @@ -2144,10 +2144,10 @@ very first version of the block.

    Binary files are searched as well.

    -
    -G<regex>
    +
    -G<regex>

    Look for differences whose patch text contains added/removed -lines that match <regex>.

    +lines that match <regex>.

    To illustrate the difference between -S<regex> --pickaxe-regex and -G<regex>, consider a commit with the following diff in the same @@ -2174,7 +2174,7 @@ filter will be ignored.

    information.

    -
    --find-object=<object-id>
    +
    --find-object=<object-id>

    Look for differences that change the number of occurrences of the specified object. Similar to -S, just the argument is different @@ -2185,18 +2185,18 @@ object id.

    git-log to also find trees.

    -
    --pickaxe-all
    +
    --pickaxe-all

    When -S or -G finds a change, show all the changes in that changeset, not just the files that contain the change -in <string>.

    +in <string>.

    -
    --pickaxe-regex
    +
    --pickaxe-regex
    -

    Treat the <string> given to -S as an extended POSIX regular +

    Treat the <string> given to -S as an extended POSIX regular expression to match.

    -
    -O<orderfile>
    +
    -O<orderfile>

    Control the order in which files appear in the output. This overrides the diff.orderFile configuration variable @@ -2204,7 +2204,7 @@ This overrides the diff.orderFile configuration variable use -O/dev/null.

    The output order is determined by the order of glob patterns in -<orderfile>. +<orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. @@ -2216,7 +2216,7 @@ but no earlier patterns), their output order relative to each other is the normal order.

    -

    <orderfile> is parsed as follows:

    +

    <orderfile> is parsed as follows:

    @@ -2240,102 +2240,102 @@ pattern if it starts with a hash.

    Patterns have the same syntax and semantics as patterns used for -fnmatch(3) without the FNM_PATHNAME flag, except a pathname also +fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "foo*bar" matches "fooasdfbar" and "foo/bar/baz/asdf" but not "foobarx".

    -
    --skip-to=<file>
    -
    --rotate-to=<file>
    +
    --skip-to=<file>
    +
    --rotate-to=<file>
    -

    Discard the files before the named <file> from the output +

    Discard the files before the named <file> from the output (i.e. skip to), or move them to the end of the output (i.e. rotate to). These options were invented primarily for the use of the git difftool command, and may not be very useful otherwise.

    -
    -R
    +
    -R

    Swap two inputs; that is, show differences from index or on-disk file to tree contents.

    -
    --relative[=<path>]
    -
    --no-relative
    +
    --relative[=<path>]
    +
    --no-relative

    When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative -to by giving a <path> as an argument. +to by giving a <path> as an argument. --no-relative can be used to countermand both diff.relative config option and previous --relative.

    -
    -a
    -
    --text
    +
    -a
    +
    --text

    Treat all files as text.

    -
    --ignore-cr-at-eol
    +
    --ignore-cr-at-eol

    Ignore carriage-return at the end of line when doing a comparison.

    -
    --ignore-space-at-eol
    +
    --ignore-space-at-eol

    Ignore changes in whitespace at EOL.

    -
    -b
    -
    --ignore-space-change
    +
    -b
    +
    --ignore-space-change

    Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.

    -
    -w
    -
    --ignore-all-space
    +
    -w
    +
    --ignore-all-space

    Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.

    -
    --ignore-blank-lines
    +
    --ignore-blank-lines

    Ignore changes whose lines are all blank.

    -
    -I<regex>
    -
    --ignore-matching-lines=<regex>
    +
    -I<regex>
    +
    --ignore-matching-lines=<regex>
    -

    Ignore changes whose all lines match <regex>. This option may +

    Ignore changes whose all lines match <regex>. This option may be specified more than once.

    -
    --inter-hunk-context=<lines>
    +
    --inter-hunk-context=<number>
    -

    Show the context between diff hunks, up to the specified number +

    Show the context between diff hunks, up to the specified <number> of lines, thereby fusing hunks that are close to each other. Defaults to diff.interHunkContext or 0 if the config option is unset.

    -
    -W
    -
    --function-context
    +
    -W
    +
    --function-context

    Show whole function as context lines for each change. The function names are determined in the same way as -git diff works out patch hunk headers (see Defining a -custom hunk-header in gitattributes(5)).

    +git diff works out patch hunk headers (see "Defining a +custom hunk-header" in gitattributes(5)).

    -
    --ext-diff
    +
    --ext-diff

    Allow an external diff helper to be executed. If you set an external diff driver with gitattributes(5), you need to use this option with git-log(1) and friends.

    -
    --no-ext-diff
    +
    --no-ext-diff

    Disallow external diff drivers.

    -
    --textconv
    -
    --no-textconv
    +
    --textconv
    +
    --no-textconv

    Allow (or disallow) external text conversion filters to be run when comparing binary files. See gitattributes(5) for @@ -2346,49 +2346,48 @@ filters are enabled by default only for git-diff(1) git-log(1), but not for git-format-patch(1) or diff plumbing commands.

    -
    --ignore-submodules[=<when>]
    +
    --ignore-submodules[=(none|untracked|dirty|all)]
    -

    Ignore changes to submodules in the diff generation. <when> can be -either "none", "untracked", "dirty" or "all", which is the default. -Using "none" will consider the submodule modified when it either contains -untracked or modified files or its HEAD differs from the commit recorded +

    Ignore changes to submodules in the diff generation. all is the default. +Using none will consider the submodule modified when it either contains +untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the -ignore option in git-config(1) or gitmodules(5). When -"untracked" is used submodules are not considered dirty when they only +ignore option in git-config(1) or gitmodules(5). When +untracked is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified -content). Using "dirty" ignores all changes to the work tree of submodules, +content). Using dirty ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was -the behavior until 1.7.0). Using "all" hides all changes to submodules.

    +the behavior until 1.7.0). Using all hides all changes to submodules.

    -
    --src-prefix=<prefix>
    +
    --src-prefix=<prefix>
    -

    Show the given source prefix instead of "a/".

    +

    Show the given source <prefix> instead of "a/".

    -
    --dst-prefix=<prefix>
    +
    --dst-prefix=<prefix>
    -

    Show the given destination prefix instead of "b/".

    +

    Show the given destination <prefix> instead of "b/".

    -
    --no-prefix
    +
    --no-prefix

    Do not show any source or destination prefix.

    -
    --default-prefix
    +
    --default-prefix

    Use the default source and destination prefixes ("a/" and "b/"). This overrides configuration variables such as diff.noprefix, diff.srcPrefix, diff.dstPrefix, and diff.mnemonicPrefix -(see git-config(1)).

    +(see git-config(1)).

    -
    --line-prefix=<prefix>
    +
    --line-prefix=<prefix>
    -

    Prepend an additional prefix to every line of output.

    +

    Prepend an additional <prefix> to every line of output.

    -
    --ita-invisible-in-index
    +
    --ita-invisible-in-index
    -

    By default entries added by "git add -N" appear as an existing -empty file in "git diff" and a new file in "git diff --cached". -This option makes the entry appear as a new file in "git diff" -and non-existent in "git diff --cached". This option could be +

    By default entries added by git add -N appear as an existing +empty file in git diff and a new file in git diff --cached. +This option makes the entry appear as a new file in git diff +and non-existent in git diff --cached. This option could be reverted with --ita-visible-in-index. Both options are experimental and could be removed in future.

    @@ -2417,7 +2416,7 @@ You can customize the creation of patch text via the (see git(1)), and the diff attribute (see gitattributes(5)).

    -

    What the -p option produces is slightly different from the traditional +

    What the -p option produces is slightly different from the traditional diff format:

    @@ -2442,23 +2441,21 @@ the file that the rename/copy produces, respectively.

  • It is followed by one or more extended header lines:

    -
    -
    -
    old mode <mode>
-new mode <mode>
-deleted file mode <mode>
-new file mode <mode>
-copy from <path>
-copy to <path>
-rename from <path>
-rename to <path>
-similarity index <number>
-dissimilarity index <number>
-index <hash>..<hash> <mode>
    -
    -
    -
    -

    File modes are printed as 6-digit octal numbers including the file type +

    +
    old mode <mode>
+new mode <mode>
+deleted file mode <mode>
+new file mode <mode>
+copy from <path>
+copy to <path>
+rename from <path>
+rename to <path>
+similarity index <number>
+dissimilarity index <number>
+index <hash>`..`<hash> <mode>
    +
    +
    +

    File modes <mode> are printed as 6-digit octal numbers including the file type and file permission bits.

    @@ -2474,7 +2471,7 @@ file made it into the new one.

    The index line includes the blob object names before and after the change. -The <mode> is included if the file mode does not change; otherwise, +The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode.

    • @@ -2576,20 +2573,18 @@ this (when the -c option is used):

  • It is followed by one or more extended header lines (this example shows a merge with two parents):

    -
    -
    -
    index <hash>,<hash>..<hash>
-mode <mode>,<mode>..<mode>
-new file mode <mode>
-deleted file mode <mode>,<mode>
    -
    +
    +
    index <hash>,<hash>`..__<hash>__
+{empty}`mode <mode>,<mode>``..``<mode>
+new file mode <mode>
+deleted file mode <mode>,<mode>

    The mode <mode>,<mode>..<mode> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two -<tree-ish> and are not used by combined diff format.

    +<tree-ish> and are not used by combined diff format.

  • @@ -2817,7 +2812,7 @@ reversible operation.

    • diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 96a653f9..de39d494 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -442,7 +442,7 @@ pre>code {
    @@ -705,7 +705,7 @@ tip of your master again and redo the two merges:

    diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 0351ce25..4099dbf6 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -442,7 +442,7 @@ pre>code {
    @@ -1326,7 +1326,7 @@ $ git update-ref -d $mf/ai/topic
    diff --git a/howto/new-command.html b/howto/new-command.html index 6bcdc52e..29adaabb 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -442,7 +442,7 @@ pre>code {
    @@ -584,7 +584,7 @@ letter [PATCH 0/n].

    diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 69e204c5..f16d36a2 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -442,7 +442,7 @@ pre>code {
    @@ -656,7 +656,7 @@ the #1' commit.

    diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index edcab568..2c2e381b 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -442,7 +442,7 @@ pre>code {
    @@ -563,7 +563,7 @@ some locking mechanism for this.

    diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 014896f2..0c18e64e 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -442,7 +442,7 @@ pre>code {
    @@ -641,7 +641,7 @@ thing.

    diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 157b17c6..fbb05f69 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -442,7 +442,7 @@ pre>code {
    @@ -967,7 +967,7 @@ int main(int argc, char **argv)
    diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 972ac454..6a206e56 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -442,7 +442,7 @@ pre>code {
    @@ -829,7 +829,7 @@ P---o---o---M---x---x---W---x---M2
    diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index a71f5cf8..67aa508e 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -442,7 +442,7 @@ pre>code {
    @@ -649,7 +649,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
    diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 80d2b0d3..857f0d3f 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -442,7 +442,7 @@ pre>code {
    @@ -568,7 +568,7 @@ o---o"master"
    diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index d22f6d0e..b3979e0a 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -442,7 +442,7 @@ pre>code {
    @@ -882,7 +882,7 @@ help diagnosing the problem, but removes security checks.

    diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index de1ea0c3..07300828 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -442,7 +442,7 @@ pre>code {
    @@ -648,7 +648,7 @@ that JC can make non-fast-forward pushes on it.

    diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 05a36294..ff3ea12c 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -442,7 +442,7 @@ pre>code {
    @@ -524,7 +524,7 @@ a good practice to put the paths after a "--" separator.

    diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index f41da8bf..06f671fd 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -442,7 +442,7 @@ pre>code {
    @@ -554,7 +554,7 @@ to.

    diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 689422bd..1db615d6 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -442,7 +442,7 @@ pre>code {
    @@ -712,7 +712,7 @@ as part of the merge commit.

    diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index 5ccd4656..0f3c1494 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/api-index.html b/technical/api-index.html index e0aca8e1..693f58a1 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/api-merge.html b/technical/api-merge.html index 26e880a3..4a507d8a 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index f837a49b..77ecb43c 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index ef266c57..df858335 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/api-trace2.html b/technical/api-trace2.html index 25967c76..88a7f782 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index 9dc580c5..d16db882 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index f940c109..61ae5160 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 42d7194a..3ff91707 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index 8aa65f55..3fb87025 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 37b72960..a3142caf 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index 7fd753bd..543ae39d 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index 0857fed7..7ae95809 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/partial-clone.html b/technical/partial-clone.html index 69e3cc99..b8e5d666 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/platform-support.html b/technical/platform-support.html index 2425cb42..a39bd120 100644 --- a/technical/platform-support.html +++ b/technical/platform-support.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/racy-git.html b/technical/racy-git.html index 409282dd..e9d7fb7a 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/scalar.html b/technical/scalar.html index 149e98c5..b05aeda5 100644 --- a/technical/scalar.html +++ b/technical/scalar.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index 1fd473e0..654a432f 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/shallow.html b/technical/shallow.html index 2c181414..edb4e9fe 100644 --- a/technical/shallow.html +++ b/technical/shallow.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 70b00427..833484ef 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    diff --git a/technical/unit-tests.html b/technical/unit-tests.html index 302153af..07753562 100644 --- a/technical/unit-tests.html +++ b/technical/unit-tests.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    -- 2.11.4.GIT