{"thread":{"id":"62480","subject":"[PATCH] doc: git-add.txt: convert to new style convention","startedAt":"2024-11-11T18:14:55Z","lastAt":"2024-11-16T21:42:59Z","messageCount":5,"participants":["Jean-Noël Avila via GitGitGadget","Junio C Hamano","Jean-Noël Avila"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"507067","messageId":"pull.1826.git.1731348891108.gitgitgadget@gmail.com","threadId":"62480","inReplyTo":null,"subject":"[PATCH] doc: git-add.txt: convert to new style convention","fromName":"Jean-Noël Avila via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-11-11T18:14:50Z","receivedAt":"2024-11-11T18:14:55Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>\n\nSigned-off-by: Jean-Noël Avila <jn.avila@free.fr>\n---\n    doc: git-add.txt: convert to new style convention\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1826%2Fjnavila%2Fnew_git_add-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1826/jnavila/new_git_add-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1826\n\n Documentation/config/add.txt |  19 +++---\n Documentation/git-add.txt    | 111 ++++++++++++++++++-----------------\n 2 files changed, 68 insertions(+), 62 deletions(-)\n\ndiff --git a/Documentation/config/add.txt b/Documentation/config/add.txt\nindex 4d753f006ec..7497533cbcc 100644\n--- a/Documentation/config/add.txt\n+++ b/Documentation/config/add.txt\n@@ -1,7 +1,12 @@\n-add.ignoreErrors::\n-add.ignore-errors (deprecated)::\n-\tTells 'git add' to continue adding files when some files cannot be\n-\tadded due to indexing errors. Equivalent to the `--ignore-errors`\n-\toption of linkgit:git-add[1].  `add.ignore-errors` is deprecated,\n-\tas it does not follow the usual naming convention for configuration\n-\tvariables.\n+`add.ignoreErrors`::\n+`add.ignore-errors` (deprecated)::\n+\tTells `git add` to continue adding files when some files cannot be\n+\tadded due to indexing errors.\n+ifdef::git-add[]\n+\tEquivalent to the `--ignore-errors` option.\n+endif::git-add[]\n+ifndef::git-add[]\n+\tEquivalent to the `--ignore-errors` option of linkgit:git-add[1].\n+endif::git-add[]\n+\t`add.ignore-errors` is deprecated, as it does not follow the usual\n+\tnaming convention for configuration variables.\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex aceaa025e30..5f2c3592b8d 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -7,12 +7,12 @@ git-add - Add file contents to the index\n \n SYNOPSIS\n --------\n-[verse]\n-'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n-\t  [--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]\n-\t  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n-\t  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n-\t  [--] [<pathspec>...]\n+[synopsis]\n+git add [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n+\t[--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]\n+\t[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n+\t[--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n+\t[--] [<pathspec>...]\n \n DESCRIPTION\n -----------\n@@ -41,7 +41,7 @@ The `git add` command will not add ignored files by default.  If any\n ignored files were explicitly specified on the command line, `git add`\n will fail with a list of ignored files.  Ignored files reached by\n directory recursion or filename globbing performed by Git (quote your\n-globs before the shell) will be silently ignored.  The 'git add' command can\n+globs before the shell) will be silently ignored.  The `git add` command can\n be used to add ignored files with the `-f` (force) option.\n \n Please see linkgit:git-commit[1] for alternative ways to add content to a\n@@ -50,7 +50,7 @@ commit.\n \n OPTIONS\n -------\n-<pathspec>...::\n+`<pathspec>...`::\n \tFiles to add content from.  Fileglobs (e.g. `*.c`) can\n \tbe given to add all matching files.  Also a\n \tleading directory name (e.g. `dir` to add `dir/file1`\n@@ -66,35 +66,35 @@ OPTIONS\n For more details about the _<pathspec>_ syntax, see the 'pathspec' entry\n in linkgit:gitglossary[7].\n \n--n::\n---dry-run::\n+`-n`::\n+`--dry-run`::\n \tDon't actually add the file(s), just show if they exist and/or will\n \tbe ignored.\n \n--v::\n---verbose::\n+`-v`::\n+`--verbose`::\n         Be verbose.\n \n--f::\n---force::\n+`-f`::\n+`--force`::\n \tAllow adding otherwise ignored files.\n \n---sparse::\n+`--sparse`::\n \tAllow updating index entries outside of the sparse-checkout cone.\n \tNormally, `git add` refuses to update index entries whose paths do\n \tnot fit within the sparse-checkout cone, since those files might\n \tbe removed from the working tree without warning. See\n \tlinkgit:git-sparse-checkout[1] for more details.\n \n--i::\n---interactive::\n+`-i`::\n+`--interactive`::\n \tAdd modified contents in the working tree interactively to\n \tthe index. Optional path arguments may be supplied to limit\n \toperation to a subset of the working tree. See ``Interactive\n \tmode'' for details.\n \n--p::\n---patch::\n+`-p`::\n+`--patch`::\n \tInteractively choose hunks of patch between the index and the\n \twork tree and add them to the index. This gives the user a chance\n \tto review the difference before adding modified contents to the\n@@ -104,8 +104,8 @@ This effectively runs `add --interactive`, but bypasses the\n initial command menu and directly jumps to the `patch` subcommand.\n See ``Interactive mode'' for details.\n \n--e::\n---edit::\n+`-e`::\n+`--edit`::\n \tOpen the diff vs. the index in an editor and let the user\n \tedit it.  After the editor was closed, adjust the hunk headers\n \tand apply the patch to the index.\n@@ -116,8 +116,8 @@ quicker and more flexible than using the interactive hunk selector.\n However, it is easy to confuse oneself and create a patch that does not\n apply to the index. See EDITING PATCHES below.\n \n--u::\n---update::\n+`-u`::\n+`--update`::\n \tUpdate the index just where it already has an entry matching\n \t_<pathspec>_.  This removes as well as modifies index entries to\n \tmatch the working tree, but adds no new files.\n@@ -127,9 +127,9 @@ tracked files in the entire working tree are updated (old versions\n of Git used to limit the update to the current directory and its\n subdirectories).\n \n--A::\n---all::\n---no-ignore-removal::\n+`-A`::\n+`--all`::\n+`--no-ignore-removal`::\n \tUpdate the index not only where the working tree has a file\n \tmatching _<pathspec>_ but also where the index already has an\n \tentry. This adds, modifies, and removes index entries to\n@@ -140,77 +140,77 @@ files in the entire working tree are updated (old versions\n of Git used to limit the update to the current directory and its\n subdirectories).\n \n---no-all::\n---ignore-removal::\n+`--no-all`::\n+`--ignore-removal`::\n \tUpdate the index by adding new files that are unknown to the\n \tindex and files modified in the working tree, but ignore\n \tfiles that have been removed from the working tree.  This\n \toption is a no-op when no _<pathspec>_ is used.\n +\n This option is primarily to help users who are used to older\n-versions of Git, whose \"git add _<pathspec>_...\" was a synonym\n-for \"git add --no-all _<pathspec>_...\", i.e. ignored removed files.\n+versions of Git, whose `git add <pathspec>...` was a synonym\n+for `git add --no-all <pathspec>...`, i.e. ignored removed files.\n \n--N::\n---intent-to-add::\n+`-N`::\n+`--intent-to-add`::\n \tRecord only the fact that the path will be added later. An entry\n \tfor the path is placed in the index with no content. This is\n \tuseful for, among other things, showing the unstaged content of\n \tsuch files with `git diff` and committing them with `git commit\n \t-a`.\n \n---refresh::\n+`--refresh`::\n \tDon't add the file(s), but only refresh their stat()\n \tinformation in the index.\n \n---ignore-errors::\n+`--ignore-errors`::\n \tIf some files could not be added because of errors indexing\n \tthem, do not abort the operation, but continue adding the\n \tothers. The command shall still exit with non-zero status.\n \tThe configuration variable `add.ignoreErrors` can be set to\n \ttrue to make this the default behaviour.\n \n---ignore-missing::\n-\tThis option can only be used together with --dry-run. By using\n+`--ignore-missing`::\n+\tThis option can only be used together with `--dry-run`. By using\n \tthis option the user can check if any of the given files would\n \tbe ignored, no matter if they are already present in the work\n \ttree or not.\n \n---no-warn-embedded-repo::\n+`--no-warn-embedded-repo`::\n \tBy default, `git add` will warn when adding an embedded\n \trepository to the index without using `git submodule add` to\n \tcreate an entry in `.gitmodules`. This option will suppress the\n \twarning (e.g., if you are manually performing operations on\n \tsubmodules).\n \n---renormalize::\n+`--renormalize`::\n \tApply the \"clean\" process freshly to all tracked files to\n \tforcibly add them again to the index.  This is useful after\n \tchanging `core.autocrlf` configuration or the `text` attribute\n-\tin order to correct files added with wrong CRLF/LF line endings.\n+\tin order to correct files added with wrong _CRLF/LF_ line endings.\n \tThis option implies `-u`. Lone CR characters are untouched, thus\n-\twhile a CRLF cleans to LF, a CRCRLF sequence is only partially\n-\tcleaned to CRLF.\n+\twhile a _CRLF_ cleans to _LF_, a _CRCRLF_ sequence is only partially\n+\tcleaned to _CRLF_.\n \n---chmod=(+|-)x::\n+`--chmod=(+|-)x`::\n \tOverride the executable bit of the added files.  The executable\n \tbit is only changed in the index, the files on disk are left\n \tunchanged.\n \n---pathspec-from-file=<file>::\n+`--pathspec-from-file=<file>`::\n \tPathspec is passed in _<file>_ instead of commandline args. If\n \t_<file>_ is exactly `-` then standard input is used. Pathspec\n-\telements are separated by LF or CR/LF. Pathspec elements can be\n+\telements are separated by _LF_ or _CR/LF_. Pathspec elements can be\n \tquoted as explained for the configuration variable `core.quotePath`\n \t(see linkgit:git-config[1]). See also `--pathspec-file-nul` and\n \tglobal `--literal-pathspecs`.\n \n---pathspec-file-nul::\n+`--pathspec-file-nul`::\n \tOnly meaningful with `--pathspec-from-file`. Pathspec elements are\n-\tseparated with NUL character and all other characters are taken\n+\tseparated with _NUL_ character and all other characters are taken\n \tliterally (including newlines and quotes).\n \n-\\--::\n+`--`::\n \tThis option can be used to separate command-line options from\n \tthe list of files, (useful when filenames might be mistaken\n \tfor command-line options).\n@@ -219,18 +219,18 @@ for \"git add --no-all _<pathspec>_...\", i.e. ignored removed files.\n EXAMPLES\n --------\n \n-* Adds content from all `*.txt` files under `Documentation` directory\n+* Adds content from all ++*.txt++ files under `Documentation` directory\n   and its subdirectories:\n +\n ------------\n $ git add Documentation/\\*.txt\n ------------\n +\n-Note that the asterisk `*` is quoted from the shell in this\n+Note that the asterisk ++*++ is quoted from the shell in this\n example; this lets the command include the files from\n subdirectories of `Documentation/` directory.\n \n-* Considers adding content from all git-*.sh scripts:\n+* Considers adding content from all ++git-*.sh++ scripts:\n +\n ------------\n $ git add git-*.sh\n@@ -265,7 +265,7 @@ The main command loop has 6 subcommands (plus help and quit).\n \n status::\n \n-   This shows the change between HEAD and index (i.e. what will be\n+   This shows the change between `HEAD` and index (i.e. what will be\n    committed if you say `git commit`), and between index and\n    working tree files (i.e. what you could stage further before\n    `git commit` using `git add`) for each path.  A sample output\n@@ -277,12 +277,12 @@ status::\n      2:     +403/-35        +1/-1 add-interactive.c\n ------------\n +\n-It shows that foo.png has differences from HEAD (but that is\n+It shows that `foo.png` has differences from `HEAD` (but that is\n binary so line count cannot be shown) and there is no\n difference between indexed copy and the working tree\n version (if the working tree version were also different,\n 'binary' would have been shown in place of 'nothing').  The\n-other file, add-interactive.c, has 403 lines added\n+other file, `add-interactive.c`, has 403 lines added\n and 35 lines deleted if you commit what is in the index, but\n working tree file has further modifications (one addition and\n one deletion).\n@@ -360,7 +360,7 @@ variable `interactive.singleKey` to `true`.\n diff::\n \n   This lets you review what will be committed (i.e. between\n-  HEAD and index).\n+  `HEAD` and index).\n \n \n EDITING PATCHES\n@@ -399,7 +399,7 @@ There are also more complex operations that can be performed. But beware\n that because the patch is applied only to the index and not the working\n tree, the working tree will appear to \"undo\" the change in the index.\n For example, introducing a new line into the index that is in neither\n-the HEAD nor the working tree will stage the new line for commit, but\n+the `HEAD` nor the working tree will stage the new line for commit, but\n the line will appear to be reverted in the working tree.\n \n Avoid using these constructs, or do so with extreme caution.\n@@ -439,6 +439,7 @@ CONFIGURATION\n \n include::includes/cmd-config-section-all.txt[]\n \n+:git-add: 1\n include::config/add.txt[]\n \n SEE ALSO\n\nbase-commit: facbe4f633e4ad31e641f64617bc88074c659959\n-- \ngitgitgadget\n"},{"id":"507093","messageId":"xmqqserx8ewu.fsf@gitster.g","threadId":"62480","inReplyTo":"pull.1826.git.1731348891108.gitgitgadget@gmail.com","subject":"Re: [PATCH] doc: git-add.txt: convert to new style convention","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-11-12T00:38:25Z","receivedAt":"2024-11-12T00:38:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Jean-Noël Avila via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>\n>\n> Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>\n> ---\n>     doc: git-add.txt: convert to new style convention\n\nThis does slightly more than converting to new style, though,\ndoesn't it?  Is it so annoying to see a link that points at the same\npage you are reading right now to warrant duplicating some docs with\nconditional inclusion?\n\n> +`add.ignoreErrors`::\n> +`add.ignore-errors` (deprecated)::\n> +\tTells `git add` to continue adding files when some files cannot be\n> +\tadded due to indexing errors.\n> +ifdef::git-add[]\n> +\tEquivalent to the `--ignore-errors` option.\n> +endif::git-add[]\n> +ifndef::git-add[]\n> +\tEquivalent to the `--ignore-errors` option of linkgit:git-add[1].\n> +endif::git-add[]\n\n>  SYNOPSIS\n>  --------\n> -[verse]\n> -'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n> -\t  [--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]\n> -\t  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n> -\t  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n> -\t  [--] [<pathspec>...]\n> +[synopsis]\n> +git add [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n> +\t[--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]\n> +\t[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n> +\t[--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n> +\t[--] [<pathspec>...]\n\nNot having to worry about `mark-up` _rules_ in the synopsis section\nis very nice ;-)\n\n"},{"id":"507132","messageId":"0882542f-8424-4dfc-8358-f5c982aafbd4@scantech.com","threadId":"62480","inReplyTo":"xmqqserx8ewu.fsf@gitster.g","subject":"Re: [PATCH] doc: git-add.txt: convert to new style convention","fromName":"Jean-Noël Avila","fromEmail":"jean-noel.avila@scantech.com","sentAt":"2024-11-12T09:25:10Z","receivedAt":"2024-11-12T10:43:04Z","isPatch":true,"sender":{"key":"jean-noel.avila@scantech.com","avatar":null},"body":"Le 12/11/2024 à 01:38, Junio C Hamano a écrit :\n> \"Jean-Noël Avila via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n> \n>> From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>\n>>\n>> Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>\n>> ---\n>>     doc: git-add.txt: convert to new style convention\n> \n> This does slightly more than converting to new style, though,\n> doesn't it?  Is it so annoying to see a link that points at the same\n> page you are reading right now to warrant duplicating some docs with\n> conditional inclusion?\n> \n>> +`add.ignoreErrors`::\n>> +`add.ignore-errors` (deprecated)::\n>> +\tTells `git add` to continue adding files when some files cannot be\n>> +\tadded due to indexing errors.\n>> +ifdef::git-add[]\n>> +\tEquivalent to the `--ignore-errors` option.\n>> +endif::git-add[]\n>> +ifndef::git-add[]\n>> +\tEquivalent to the `--ignore-errors` option of linkgit:git-add[1].\n>> +endif::git-add[]\n> \n\nThis was already performed for git-clone (ebb55042a4) and git-init\n(e7b3a7683c). Should it be separated in a dedicated commit?\n\n\nIf the link is not to a specific anchor in the doc (which is the aim in\nhtml output), it is considered bad practice (against the \"Make your\nvisitor confident that the link they're following will take them where\nthey want to go\" principle). To create a sensible link, we would have to\nbring the visitor to the corresponding option description. This is\ndoable, but would require an enhanced linkgit macro and additional anchors.\n\n\n\n\nbegin:vcard\nfn;quoted-printable:Jean-No=C3=ABl Avila\nn;quoted-printable:Avila;Jean-No=C3=ABl\norg:Scantech S.A.\nadr;quoted-printable:Savoie Technolac BP 244;;B=C3=A2timent Androm=C3=A8de - 108 Avenue du Lac L=C3=A9man ; LA MOTTE SERVOLEX;;73290;France\nemail;internet:jean-noel.avila@scantech.com\ntitle:Embedded systems manager\ntel;work:+33 479 25 54 50\ntel;cell:+33 633 04 64 18\nx-mozilla-html:FALSE\nurl:http://www.scantech.com\nversion:2.1\nend:vcard\n\n"},{"id":"507163","messageId":"xmqqpln03wjl.fsf@gitster.g","threadId":"62480","inReplyTo":"0882542f-8424-4dfc-8358-f5c982aafbd4@scantech.com","subject":"Re: [PATCH] doc: git-add.txt: convert to new style convention","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-11-12T22:41:02Z","receivedAt":"2024-11-12T22:41:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jean-Noël Avila <jean-noel.avila@scantech.com> writes:\n\n>> This does slightly more than converting to new style, though,\n>> doesn't it?  Is it so annoying to see a link that points at the same\n>> page you are reading right now to warrant duplicating some docs with\n>> conditional inclusion?\n> ...\n> This was already performed for git-clone (ebb55042a4) and git-init\n> (e7b3a7683c). Should it be separated in a dedicated commit?\n\nMy comment came primarily as a reaction to seeing this change that\nwas not part of what the proposed log message said.  As you say, as\na separate and orthogonal thing, we could make it a separate commit.\nBut it also is perfectly fine if the log message explained that we\nare doing this independent change \"while we are at it\".\n\nThanks.\n"},{"id":"507419","messageId":"pull.1826.v2.git.1731793374648.gitgitgadget@gmail.com","threadId":"62480","inReplyTo":"pull.1826.git.1731348891108.gitgitgadget@gmail.com","subject":"[PATCH v2] doc: git-add.txt: convert to new style convention","fromName":"Jean-Noël Avila via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-11-16T21:42:54Z","receivedAt":"2024-11-16T21:42:59Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>\n\nWhile we are at it, let's refactor the corresponding configuration\ndocumentation to prevent auto-referencing git-add in its own manpage.\n\nSigned-off-by: Jean-Noël Avila <jn.avila@free.fr>\n---\n    doc: git-add.txt: convert to new style convention\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1826%2Fjnavila%2Fnew_git_add-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1826/jnavila/new_git_add-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/1826\n\nRange-diff vs v1:\n\n 1:  9caabbcb263 ! 1:  7028145ae4d doc: git-add.txt: convert to new style convention\n     @@ Metadata\n       ## Commit message ##\n          doc: git-add.txt: convert to new style convention\n      \n     +    While we are at it, let's refactor the corresponding configuration\n     +    documentation to prevent auto-referencing git-add in its own manpage.\n     +\n          Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>\n      \n       ## Documentation/config/add.txt ##\n\n\n Documentation/config/add.txt |  19 +++---\n Documentation/git-add.txt    | 111 ++++++++++++++++++-----------------\n 2 files changed, 68 insertions(+), 62 deletions(-)\n\ndiff --git a/Documentation/config/add.txt b/Documentation/config/add.txt\nindex 4d753f006ec..7497533cbcc 100644\n--- a/Documentation/config/add.txt\n+++ b/Documentation/config/add.txt\n@@ -1,7 +1,12 @@\n-add.ignoreErrors::\n-add.ignore-errors (deprecated)::\n-\tTells 'git add' to continue adding files when some files cannot be\n-\tadded due to indexing errors. Equivalent to the `--ignore-errors`\n-\toption of linkgit:git-add[1].  `add.ignore-errors` is deprecated,\n-\tas it does not follow the usual naming convention for configuration\n-\tvariables.\n+`add.ignoreErrors`::\n+`add.ignore-errors` (deprecated)::\n+\tTells `git add` to continue adding files when some files cannot be\n+\tadded due to indexing errors.\n+ifdef::git-add[]\n+\tEquivalent to the `--ignore-errors` option.\n+endif::git-add[]\n+ifndef::git-add[]\n+\tEquivalent to the `--ignore-errors` option of linkgit:git-add[1].\n+endif::git-add[]\n+\t`add.ignore-errors` is deprecated, as it does not follow the usual\n+\tnaming convention for configuration variables.\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex aceaa025e30..5f2c3592b8d 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -7,12 +7,12 @@ git-add - Add file contents to the index\n \n SYNOPSIS\n --------\n-[verse]\n-'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n-\t  [--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]\n-\t  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n-\t  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n-\t  [--] [<pathspec>...]\n+[synopsis]\n+git add [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n+\t[--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]\n+\t[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n+\t[--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n+\t[--] [<pathspec>...]\n \n DESCRIPTION\n -----------\n@@ -41,7 +41,7 @@ The `git add` command will not add ignored files by default.  If any\n ignored files were explicitly specified on the command line, `git add`\n will fail with a list of ignored files.  Ignored files reached by\n directory recursion or filename globbing performed by Git (quote your\n-globs before the shell) will be silently ignored.  The 'git add' command can\n+globs before the shell) will be silently ignored.  The `git add` command can\n be used to add ignored files with the `-f` (force) option.\n \n Please see linkgit:git-commit[1] for alternative ways to add content to a\n@@ -50,7 +50,7 @@ commit.\n \n OPTIONS\n -------\n-<pathspec>...::\n+`<pathspec>...`::\n \tFiles to add content from.  Fileglobs (e.g. `*.c`) can\n \tbe given to add all matching files.  Also a\n \tleading directory name (e.g. `dir` to add `dir/file1`\n@@ -66,35 +66,35 @@ OPTIONS\n For more details about the _<pathspec>_ syntax, see the 'pathspec' entry\n in linkgit:gitglossary[7].\n \n--n::\n---dry-run::\n+`-n`::\n+`--dry-run`::\n \tDon't actually add the file(s), just show if they exist and/or will\n \tbe ignored.\n \n--v::\n---verbose::\n+`-v`::\n+`--verbose`::\n         Be verbose.\n \n--f::\n---force::\n+`-f`::\n+`--force`::\n \tAllow adding otherwise ignored files.\n \n---sparse::\n+`--sparse`::\n \tAllow updating index entries outside of the sparse-checkout cone.\n \tNormally, `git add` refuses to update index entries whose paths do\n \tnot fit within the sparse-checkout cone, since those files might\n \tbe removed from the working tree without warning. See\n \tlinkgit:git-sparse-checkout[1] for more details.\n \n--i::\n---interactive::\n+`-i`::\n+`--interactive`::\n \tAdd modified contents in the working tree interactively to\n \tthe index. Optional path arguments may be supplied to limit\n \toperation to a subset of the working tree. See ``Interactive\n \tmode'' for details.\n \n--p::\n---patch::\n+`-p`::\n+`--patch`::\n \tInteractively choose hunks of patch between the index and the\n \twork tree and add them to the index. This gives the user a chance\n \tto review the difference before adding modified contents to the\n@@ -104,8 +104,8 @@ This effectively runs `add --interactive`, but bypasses the\n initial command menu and directly jumps to the `patch` subcommand.\n See ``Interactive mode'' for details.\n \n--e::\n---edit::\n+`-e`::\n+`--edit`::\n \tOpen the diff vs. the index in an editor and let the user\n \tedit it.  After the editor was closed, adjust the hunk headers\n \tand apply the patch to the index.\n@@ -116,8 +116,8 @@ quicker and more flexible than using the interactive hunk selector.\n However, it is easy to confuse oneself and create a patch that does not\n apply to the index. See EDITING PATCHES below.\n \n--u::\n---update::\n+`-u`::\n+`--update`::\n \tUpdate the index just where it already has an entry matching\n \t_<pathspec>_.  This removes as well as modifies index entries to\n \tmatch the working tree, but adds no new files.\n@@ -127,9 +127,9 @@ tracked files in the entire working tree are updated (old versions\n of Git used to limit the update to the current directory and its\n subdirectories).\n \n--A::\n---all::\n---no-ignore-removal::\n+`-A`::\n+`--all`::\n+`--no-ignore-removal`::\n \tUpdate the index not only where the working tree has a file\n \tmatching _<pathspec>_ but also where the index already has an\n \tentry. This adds, modifies, and removes index entries to\n@@ -140,77 +140,77 @@ files in the entire working tree are updated (old versions\n of Git used to limit the update to the current directory and its\n subdirectories).\n \n---no-all::\n---ignore-removal::\n+`--no-all`::\n+`--ignore-removal`::\n \tUpdate the index by adding new files that are unknown to the\n \tindex and files modified in the working tree, but ignore\n \tfiles that have been removed from the working tree.  This\n \toption is a no-op when no _<pathspec>_ is used.\n +\n This option is primarily to help users who are used to older\n-versions of Git, whose \"git add _<pathspec>_...\" was a synonym\n-for \"git add --no-all _<pathspec>_...\", i.e. ignored removed files.\n+versions of Git, whose `git add <pathspec>...` was a synonym\n+for `git add --no-all <pathspec>...`, i.e. ignored removed files.\n \n--N::\n---intent-to-add::\n+`-N`::\n+`--intent-to-add`::\n \tRecord only the fact that the path will be added later. An entry\n \tfor the path is placed in the index with no content. This is\n \tuseful for, among other things, showing the unstaged content of\n \tsuch files with `git diff` and committing them with `git commit\n \t-a`.\n \n---refresh::\n+`--refresh`::\n \tDon't add the file(s), but only refresh their stat()\n \tinformation in the index.\n \n---ignore-errors::\n+`--ignore-errors`::\n \tIf some files could not be added because of errors indexing\n \tthem, do not abort the operation, but continue adding the\n \tothers. The command shall still exit with non-zero status.\n \tThe configuration variable `add.ignoreErrors` can be set to\n \ttrue to make this the default behaviour.\n \n---ignore-missing::\n-\tThis option can only be used together with --dry-run. By using\n+`--ignore-missing`::\n+\tThis option can only be used together with `--dry-run`. By using\n \tthis option the user can check if any of the given files would\n \tbe ignored, no matter if they are already present in the work\n \ttree or not.\n \n---no-warn-embedded-repo::\n+`--no-warn-embedded-repo`::\n \tBy default, `git add` will warn when adding an embedded\n \trepository to the index without using `git submodule add` to\n \tcreate an entry in `.gitmodules`. This option will suppress the\n \twarning (e.g., if you are manually performing operations on\n \tsubmodules).\n \n---renormalize::\n+`--renormalize`::\n \tApply the \"clean\" process freshly to all tracked files to\n \tforcibly add them again to the index.  This is useful after\n \tchanging `core.autocrlf` configuration or the `text` attribute\n-\tin order to correct files added with wrong CRLF/LF line endings.\n+\tin order to correct files added with wrong _CRLF/LF_ line endings.\n \tThis option implies `-u`. Lone CR characters are untouched, thus\n-\twhile a CRLF cleans to LF, a CRCRLF sequence is only partially\n-\tcleaned to CRLF.\n+\twhile a _CRLF_ cleans to _LF_, a _CRCRLF_ sequence is only partially\n+\tcleaned to _CRLF_.\n \n---chmod=(+|-)x::\n+`--chmod=(+|-)x`::\n \tOverride the executable bit of the added files.  The executable\n \tbit is only changed in the index, the files on disk are left\n \tunchanged.\n \n---pathspec-from-file=<file>::\n+`--pathspec-from-file=<file>`::\n \tPathspec is passed in _<file>_ instead of commandline args. If\n \t_<file>_ is exactly `-` then standard input is used. Pathspec\n-\telements are separated by LF or CR/LF. Pathspec elements can be\n+\telements are separated by _LF_ or _CR/LF_. Pathspec elements can be\n \tquoted as explained for the configuration variable `core.quotePath`\n \t(see linkgit:git-config[1]). See also `--pathspec-file-nul` and\n \tglobal `--literal-pathspecs`.\n \n---pathspec-file-nul::\n+`--pathspec-file-nul`::\n \tOnly meaningful with `--pathspec-from-file`. Pathspec elements are\n-\tseparated with NUL character and all other characters are taken\n+\tseparated with _NUL_ character and all other characters are taken\n \tliterally (including newlines and quotes).\n \n-\\--::\n+`--`::\n \tThis option can be used to separate command-line options from\n \tthe list of files, (useful when filenames might be mistaken\n \tfor command-line options).\n@@ -219,18 +219,18 @@ for \"git add --no-all _<pathspec>_...\", i.e. ignored removed files.\n EXAMPLES\n --------\n \n-* Adds content from all `*.txt` files under `Documentation` directory\n+* Adds content from all ++*.txt++ files under `Documentation` directory\n   and its subdirectories:\n +\n ------------\n $ git add Documentation/\\*.txt\n ------------\n +\n-Note that the asterisk `*` is quoted from the shell in this\n+Note that the asterisk ++*++ is quoted from the shell in this\n example; this lets the command include the files from\n subdirectories of `Documentation/` directory.\n \n-* Considers adding content from all git-*.sh scripts:\n+* Considers adding content from all ++git-*.sh++ scripts:\n +\n ------------\n $ git add git-*.sh\n@@ -265,7 +265,7 @@ The main command loop has 6 subcommands (plus help and quit).\n \n status::\n \n-   This shows the change between HEAD and index (i.e. what will be\n+   This shows the change between `HEAD` and index (i.e. what will be\n    committed if you say `git commit`), and between index and\n    working tree files (i.e. what you could stage further before\n    `git commit` using `git add`) for each path.  A sample output\n@@ -277,12 +277,12 @@ status::\n      2:     +403/-35        +1/-1 add-interactive.c\n ------------\n +\n-It shows that foo.png has differences from HEAD (but that is\n+It shows that `foo.png` has differences from `HEAD` (but that is\n binary so line count cannot be shown) and there is no\n difference between indexed copy and the working tree\n version (if the working tree version were also different,\n 'binary' would have been shown in place of 'nothing').  The\n-other file, add-interactive.c, has 403 lines added\n+other file, `add-interactive.c`, has 403 lines added\n and 35 lines deleted if you commit what is in the index, but\n working tree file has further modifications (one addition and\n one deletion).\n@@ -360,7 +360,7 @@ variable `interactive.singleKey` to `true`.\n diff::\n \n   This lets you review what will be committed (i.e. between\n-  HEAD and index).\n+  `HEAD` and index).\n \n \n EDITING PATCHES\n@@ -399,7 +399,7 @@ There are also more complex operations that can be performed. But beware\n that because the patch is applied only to the index and not the working\n tree, the working tree will appear to \"undo\" the change in the index.\n For example, introducing a new line into the index that is in neither\n-the HEAD nor the working tree will stage the new line for commit, but\n+the `HEAD` nor the working tree will stage the new line for commit, but\n the line will appear to be reverted in the working tree.\n \n Avoid using these constructs, or do so with extreme caution.\n@@ -439,6 +439,7 @@ CONFIGURATION\n \n include::includes/cmd-config-section-all.txt[]\n \n+:git-add: 1\n include::config/add.txt[]\n \n SEE ALSO\n\nbase-commit: facbe4f633e4ad31e641f64617bc88074c659959\n-- \ngitgitgadget\n"}]}