git/Documentation/git-commit.txt, branch gitk-resize-error

Document positive variant of commit and merge option "--no-verify"

2021-10-29T18:22:56Z

This documents "--verify" option of the commands. It can be used to re-enable the hooks disabled by an earlier "--no-verify" in command-line. Signed-off-by: Alexander Riesen Signed-off-by: Junio C Hamano

Documentation: fix typo in the --patch option of the commit command

2021-06-28T20:08:25Z

Typofix (chose -> choose) in the documentation of the patch option under the commit command. Signed-off-by: Beshr Kayali Signed-off-by: Junio C Hamano

Merge branch 'zh/commit-trailer'

2021-04-07T23:54:08Z

"git commit" learned "--trailer [=]" option; together with the interpret-trailers command, this will make it easier to support custom trailers. * zh/commit-trailer: commit: add --trailer option

commit: add --trailer option

2021-03-23T17:31:38Z

Historically, Git has supported the 'Signed-off-by' commit trailer using the '--signoff' and the '-s' option from the command line. But users may need to provide other trailer information from the command line such as "Helped-by", "Reported-by", "Mentored-by", Now implement a new `--trailer [(=|:)]` option to pass other trailers to `interpret-trailers` and insert them into commit messages. Signed-off-by: ZheNing Hu Signed-off-by: Junio C Hamano

doc/git-commit: add documentation for fixup=[amend|reword] options

2021-03-15T21:29:36Z

Mentored-by: Christian Couder Mentored-by: Phillip Wood Helped-by: Eric Sunshine Helped-by: Junio C Hamano Signed-off-by: Eric Sunshine Signed-off-by: Charvi Mendiratta Signed-off-by: Junio C Hamano

doc: preparatory clean-up of description on the sign-off option

2020-10-20T18:57:35Z

Almost identical text on the signed-off-by trailer appears in the documentation for "git commit" and "git merge" and its friends. Introduce a new signoff-option.txt file to be shared. A couple of things of note are: - The short-form "-s" is available only in "git commit", but not in commands that are friends of "git merge", as it is used as a short-hand for "--strategy". - The original lacks description on the negated "--no-signoff" form on "git commit" side, but it equally is applicable. It however was unclear in the original text that not adding a Signed-off-by trailer is the default, so rephrase to explain it as a way to countermand a --signoff option that appeared earlier on the same command line. This is in preparation to apply a further clarification on what exactly the Signed-off-by trailer means. Suggested-by: Philippe Blain Signed-off-by: Junio C Hamano Reviewed-by: Taylor Blau Reviewed-by: Bradley M. Kuhn Signed-off-by: Junio C Hamano

Documentation: reword commit --no-gpg-sign

2020-04-03T18:37:22Z

Merge with --gpg-sign option, and clarify that --no-gpg-sign also override earlier --gpg-sign. Signed-off-by: Đoàn Trần Công Danh Signed-off-by: Junio C Hamano

doc: provide guidance on user.name format

2020-01-22T20:27:08Z

It's a frequent misconception that the user.name variable controls authentication in some way, and as a result, beginning users frequently attempt to change it when they're having authentication troubles. Document that the convention is that this variable represents some form of a human's personal name, although that is not required. In addition, address concerns about whether Unicode is supported. Use the term "personal name" as this is likely to draw the intended contrast, be applicable across cultures which may have different naming conventions, and be easily understandable to people who do not speak English as their first language. Indicate that "some form" is conventionally used, as people may use a nickname or preferred name instead of a full legal name. Point users who may be confused about authentication to an appropriate configuration option instead. Provide a shortened form of this information in the configuration option description. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

docs: expand on possible and recommended user config options

2020-01-22T20:27:08Z

In the section on setting author and committer information, we omit the author.* and committer.* variables, so mention them for completeness. In addition, guide users to the typical case: simply setting user.name and user.email, which are recommended if one does not need complex configuration. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

doc: move author and committer information to git-commit(1)

2020-01-22T20:27:08Z

While at one time it made perfect sense to store information about configuring author and committer information in the documentation for git commit-tree, in modern Git that operation is seldom used. Most users will use git commit and expect to find comprehensive documentation about its use in the manual page for that command. Considering that there is significant confusion about how one is to use the user.name and user.email variables, let's put as much documentation as possible into an obvious place where users will be more likely to find it. In addition, expand the environment variables section to describe their use more fully. Even though we now describe all of the options there and in the configuration settings documentation, preserve the existing text in git-commit.txt so that people can easily reason about the ordering of the various options they can use. Explain the use of the author.* and committer.* options as well. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano