Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: git-add.txt: convert to new style convention #1826

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

jnavila
Copy link

@jnavila jnavila commented Nov 11, 2024

No description provided.

@jnavila
Copy link
Author

jnavila commented Nov 11, 2024

/submit

Copy link

gitgitgadget bot commented Nov 11, 2024

Submitted as [email protected]

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1826/jnavila/new_git_add-v1

To fetch this version to local tag pr-1826/jnavila/new_git_add-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1826/jnavila/new_git_add-v1

Copy link

gitgitgadget bot commented Nov 12, 2024

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Jean-Noël Avila via GitGitGadget" <[email protected]> writes:

> From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <[email protected]>
>
> Signed-off-by: Jean-Noël Avila <[email protected]>
> ---
>     doc: git-add.txt: convert to new style convention

This does slightly more than converting to new style, though,
doesn't it?  Is it so annoying to see a link that points at the same
page you are reading right now to warrant duplicating some docs with
conditional inclusion?

> +`add.ignoreErrors`::
> +`add.ignore-errors` (deprecated)::
> +	Tells `git add` to continue adding files when some files cannot be
> +	added due to indexing errors.
> +ifdef::git-add[]
> +	Equivalent to the `--ignore-errors` option.
> +endif::git-add[]
> +ifndef::git-add[]
> +	Equivalent to the `--ignore-errors` option of linkgit:git-add[1].
> +endif::git-add[]

>  SYNOPSIS
>  --------
> -[verse]
> -'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
> -	  [--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]
> -	  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
> -	  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
> -	  [--] [<pathspec>...]
> +[synopsis]
> +git add [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
> +	[--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]
> +	[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
> +	[--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
> +	[--] [<pathspec>...]

Not having to worry about `mark-up` _rules_ in the synopsis section
is very nice ;-)

Copy link

gitgitgadget bot commented Nov 12, 2024

This patch series was integrated into seen via git@9ce5685.

@gitgitgadget gitgitgadget bot added the seen label Nov 12, 2024
Copy link

gitgitgadget bot commented Nov 12, 2024

On the Git mailing list, Jean-Noël Avila wrote (reply to this):

Le 12/11/2024 à 01:38, Junio C Hamano a écrit :
> "Jean-Noël Avila via GitGitGadget" <[email protected]> writes:
> 
>> From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <[email protected]>
>>
>> Signed-off-by: Jean-Noël Avila <[email protected]>
>> ---
>>     doc: git-add.txt: convert to new style convention
> 
> This does slightly more than converting to new style, though,
> doesn't it?  Is it so annoying to see a link that points at the same
> page you are reading right now to warrant duplicating some docs with
> conditional inclusion?
> 
>> +`add.ignoreErrors`::
>> +`add.ignore-errors` (deprecated)::
>> +	Tells `git add` to continue adding files when some files cannot be
>> +	added due to indexing errors.
>> +ifdef::git-add[]
>> +	Equivalent to the `--ignore-errors` option.
>> +endif::git-add[]
>> +ifndef::git-add[]
>> +	Equivalent to the `--ignore-errors` option of linkgit:git-add[1].
>> +endif::git-add[]
> 

This was already performed for git-clone (ebb55042a4) and git-init
(e7b3a7683c). Should it be separated in a dedicated commit?


If the link is not to a specific anchor in the doc (which is the aim in
html output), it is considered bad practice (against the "Make your
visitor confident that the link they're following will take them where
they want to go" principle). To create a sensible link, we would have to
bring the visitor to the corresponding option description. This is
doable, but would require an enhanced linkgit macro and additional anchors.

Copy link

gitgitgadget bot commented Nov 12, 2024

User Jean-Noël Avila <[email protected]> has been added to the cc: list.

Copy link

gitgitgadget bot commented Nov 12, 2024

On the Git mailing list, Junio C Hamano wrote (reply to this):

Jean-Noël Avila <[email protected]> writes:

>> This does slightly more than converting to new style, though,
>> doesn't it?  Is it so annoying to see a link that points at the same
>> page you are reading right now to warrant duplicating some docs with
>> conditional inclusion?
> ...
> This was already performed for git-clone (ebb55042a4) and git-init
> (e7b3a7683c). Should it be separated in a dedicated commit?

My comment came primarily as a reaction to seeing this change that
was not part of what the proposed log message said.  As you say, as
a separate and orthogonal thing, we could make it a separate commit.
But it also is perfectly fine if the log message explained that we
are doing this independent change "while we are at it".

Thanks.

Copy link

gitgitgadget bot commented Nov 13, 2024

This patch series was integrated into seen via git@2cf6898.

Copy link

gitgitgadget bot commented Nov 13, 2024

This patch series was integrated into next via git@1af6d17.

@gitgitgadget gitgitgadget bot added the next label Nov 13, 2024
Copy link

gitgitgadget bot commented Nov 15, 2024

This patch series was integrated into seen via git@bcc7663.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant