The meaning of a signoff depends on the project to which you’re committing. See also git-fmt-merge-msgĭo not list one-line descriptions from the actual commits being mergedĪdd a Signed-off-by trailer by the committer at the end of the commit log message. In addition to branch names, populate the log message with one-line descriptions from at most actual commits that are being merged. Is useful to countermand both commit.gpgSign configuration variable, and earlier -gpg-sign The keyid argument is optional and defaults to the committer identity if specified, it must be stuck to the option without a space When not possible, refuse to merge and exit with a non-zero status Resolve the merge as a fast-forward when possible. When not possible (when the merged-in history is not a descendant of the current history), create a merge commitĬreate a merge commit in all cases, even when the merge could instead be resolved as a fast-forward When possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch do not create a merge commit). ![]() In addition, if the is given a value of scissors, scissors will be appended to MERGE_MSG before being passed on to the commit machinery in the case of a merge conflict This option determines how the merge message will be cleaned up before committing. The -edit (or -e) option is still useful if you are giving a draft message with the -m option from the command line and want to edit it in the editor The -no-edit option can be used to accept the auto-generated message (this is generally discouraged). Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge ![]() Perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing This option can be used to override -no-commit
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |