github.com/lmorg/murex@v0.0.0-20240217211045-e081c89cd4ef/utils/man/test_git-commmit.txt (about)

     1  GIT-COMMIT(1)                                                                                                   Git Manual                                                                                                  GIT-COMMIT(1)
     2  
     3  NAME
     4         git-commit - Record changes to the repository
     5  
     6  SYNOPSIS
     7         git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
     8                    [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]
     9                    [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
    10                    [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
    11                    [--date=<date>] [--cleanup=<mode>] [--[no-]status]
    12                    [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]
    13                    [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]
    14                    [--] [<pathspec>...]
    15  
    16  DESCRIPTION
    17         Create a new commit containing the current contents of the index and the given log message describing the changes. The new commit is a direct child of HEAD, usually the tip of the current branch, and the branch is updated to
    18         point to it (unless no branch is associated with the working tree, in which case HEAD is "detached" as described in git-checkout(1)).
    19  
    20         The content to be committed can be specified in several ways:
    21  
    22          1. by using git-add(1) to incrementally "add" changes to the index before using the commit command (Note: even modified files must be "added");
    23  
    24          2. by using git-rm(1) to remove files from the working tree and the index, again before using the commit command;
    25  
    26          3. by listing files as arguments to the commit command (without --interactive or --patch switch), in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files
    27             (which must already be known to Git);
    28  
    29          4. by using the -a switch with the commit command to automatically "add" changes from all known files (i.e. all files that are already listed in the index) and to automatically "rm" files in the index that have been removed
    30             from the working tree, and then perform the actual commit;
    31  
    32          5. by using the --interactive or --patch switches with the commit command to decide one by one which files or hunks should be part of the commit in addition to contents in the index, before finalizing the operation. See the
    33             “Interactive Mode” section of git-add(1) to learn how to operate these modes.
    34  
    35         The --dry-run option can be used to obtain a summary of what is included by any of the above for the next commit by giving the same set of parameters (options and paths).
    36  
    37         If you make a commit and then find a mistake immediately after that, you can recover from it with git reset.
    38  
    39  OPTIONS
    40         -a, --all
    41             Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected.
    42  
    43         -p, --patch
    44             Use the interactive patch selection interface to choose which changes to commit. See git-add(1) for details.
    45  
    46         -C <commit>, --reuse-message=<commit>
    47             Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) when creating the commit.
    48  
    49         -c <commit>, --reedit-message=<commit>
    50             Like -C, but with -c the editor is invoked, so that the user can further edit the commit message.
    51  
    52         --fixup=[(amend|reword):]<commit>
    53             Create a new commit which "fixes up" <commit> when applied with git rebase --autosquash. Plain --fixup=<commit> creates a "fixup!" commit which changes the content of <commit> but leaves its log message untouched.
    54             --fixup=amend:<commit> is similar but creates an "amend!" commit which also replaces the log message of <commit> with the log message of the "amend!" commit.  --fixup=reword:<commit> creates an "amend!" commit which
    55             replaces the log message of <commit> with its own log message but makes no changes to the content of <commit>.
    56  
    57             The commit created by plain --fixup=<commit> has a subject composed of "fixup!" followed by the subject line from <commit>, and is recognized specially by git rebase --autosquash. The -m option may be used to supplement
    58             the log message of the created commit, but the additional commentary will be thrown away once the "fixup!" commit is squashed into <commit> by git rebase --autosquash.
    59  
    60             The commit created by --fixup=amend:<commit> is similar but its subject is instead prefixed with "amend!". The log message of <commit> is copied into the log message of the "amend!" commit and opened in an editor so it can
    61             be refined. When git rebase --autosquash squashes the "amend!" commit into <commit>, the log message of <commit> is replaced by the refined log message from the "amend!" commit. It is an error for the "amend!" commit’s log
    62             message to be empty unless --allow-empty-message is specified.
    63  
    64             --fixup=reword:<commit> is shorthand for --fixup=amend:<commit> --only. It creates an "amend!" commit with only a log message (ignoring any changes staged in the index). When squashed by git rebase --autosquash, it
    65             replaces the log message of <commit> without making any other changes.
    66  
    67             Neither "fixup!" nor "amend!" commits change authorship of <commit> when applied by git rebase --autosquash. See git-rebase(1) for details.
    68  
    69         --squash=<commit>
    70             Construct a commit message for use with rebase --autosquash. The commit message subject line is taken from the specified commit with a prefix of "squash! ". Can be used with additional commit message options (-m/-c/-C/-F).
    71             See git-rebase(1) for details.
    72  
    73         --reset-author
    74             When used with -C/-c/--amend options, or when committing after a conflicting cherry-pick, declare that the authorship of the resulting commit now belongs to the committer. This also renews the author timestamp.
    75  
    76         --short
    77             When doing a dry-run, give the output in the short-format. See git-status(1) for details. Implies --dry-run.
    78  
    79         --branch
    80             Show the branch and tracking info even in short-format.
    81  
    82         --porcelain
    83             When doing a dry-run, give the output in a porcelain-ready format. See git-status(1) for details. Implies --dry-run.
    84  
    85         --long
    86             When doing a dry-run, give the output in the long-format. Implies --dry-run.
    87  
    88         -z, --null
    89             When showing short or porcelain status output, print the filename verbatim and terminate the entries with NUL, instead of LF. If no format is given, implies the --porcelain output format. Without the -z option, filenames
    90             with "unusual" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1)).
    91  
    92         -F <file>, --file=<file>
    93             Take the commit message from the given file. Use - to read the message from the standard input.
    94  
    95         --author=<author>
    96             Override the commit author. Specify an explicit author using the standard A U Thor <author@example.com> format. Otherwise <author> is assumed to be a pattern and is used to search for an existing commit by that author
    97             (i.e. rev-list --all -i --author=<author>); the commit author is then copied from the first such commit found.
    98  
    99         --date=<date>
   100             Override the author date used in the commit.
   101  
   102         -m <msg>, --message=<msg>
   103             Use the given <msg> as the commit message. If multiple -m options are given, their values are concatenated as separate paragraphs.
   104  
   105             The -m option is mutually exclusive with -c, -C, and -F.
   106  
   107         -t <file>, --template=<file>
   108             When editing the commit message, start the editor with the contents in the given file. The commit.template configuration variable is often used to give this option implicitly to the command. This mechanism can be used by
   109             projects that want to guide participants with some hints on what to write in the message in what order. If the user exits the editor without editing the message, the commit is aborted. This has no effect when a message is
   110             given by other means, e.g. with the -m or -F options.
   111  
   112         -s, --signoff, --no-signoff
   113             Add a Signed-off-by trailer by the committer at the end of the commit log message. The meaning of a signoff depends on the project to which you’re committing. For example, it may certify that the committer has the rights
   114             to submit the work under the project’s license or agrees to some contributor representation, such as a Developer Certificate of Origin. (See http://developercertificate.org for the one used by the Linux kernel and Git
   115             projects.) Consult the documentation or leadership of the project to which you’re contributing to understand how the signoffs are used in that project.
   116  
   117             The --no-signoff option can be used to countermand an earlier --signoff option on the command line.
   118  
   119         --trailer <token>[(=|:)<value>]
   120             Specify a (<token>, <value>) pair that should be applied as a trailer. (e.g.  git commit --trailer "Signed-off-by:C O Mitter \ <committer@example.com>" --trailer "Helped-by:C O Mitter \ <committer@example.com>" will add
   121             the "Signed-off-by" trailer and the "Helped-by" trailer to the commit message.) The trailer.*  configuration variables (git-interpret-trailers(1)) can be used to define if a duplicated trailer is omitted, where in the run
   122             of trailers each trailer would appear, and other details.
   123  
   124         -n, --[no-]verify
   125             By default, the pre-commit and commit-msg hooks are run. When any of --no-verify or -n is given, these are bypassed. See also githooks(5).
   126  
   127         --allow-empty
   128             Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit. This option bypasses the safety, and is primarily for use by foreign
   129             SCM interface scripts.
   130  
   131         --allow-empty-message
   132             Like --allow-empty this command is primarily for use by foreign SCM interface scripts. It allows you to create a commit with an empty commit message without using plumbing commands like git-commit-tree(1).
   133  
   134         --cleanup=<mode>
   135             This option determines how the supplied commit message should be cleaned up before committing. The <mode> can be strip, whitespace, verbatim, scissors or default.
   136  
   137             strip
   138                 Strip leading and trailing empty lines, trailing whitespace, commentary and collapse consecutive empty lines.
   139  
   140             whitespace
   141                 Same as strip except #commentary is not removed.
   142  
   143             verbatim
   144                 Do not change the message at all.
   145  
   146             scissors
   147                 Same as whitespace except that everything from (and including) the line found below is truncated, if the message is to be edited. "#" can be customized with core.commentChar.
   148  
   149                     # ------------------------ >8 ------------------------
   150  
   151             default
   152                 Same as strip if the message is to be edited. Otherwise whitespace.
   153  
   154             The default can be changed by the commit.cleanup configuration variable (see git-config(1)).
   155  
   156         -e, --edit
   157             The message taken from file with -F, command line with -m, and from commit object with -C are usually used as the commit log message unmodified. This option lets you further edit the message taken from these sources.
   158  
   159         --no-edit
   160             Use the selected commit message without launching an editor. For example, git commit --amend --no-edit amends a commit without changing its commit message.
   161  
   162         --amend
   163             Replace the tip of the current branch by creating a new commit. The recorded tree is prepared as usual (including the effect of the -i and -o options and explicit pathspec), and the message from the original commit is used
   164             as the starting point, instead of an empty message, when no other message is specified from the command line via options such as -m, -F, -c, etc. The new commit has the same parents and author as the current one (the
   165             --reset-author option can countermand this).
   166  
   167             It is a rough equivalent for:
   168  
   169                         $ git reset --soft HEADˆ
   170                         $ ... do something else to come up with the right tree ...
   171                         $ git commit -c ORIG_HEAD
   172  
   173             but can be used to amend a merge commit.
   174  
   175             You should understand the implications of rewriting history if you amend a commit that has already been published. (See the "RECOVERING FROM UPSTREAM REBASE" section in git-rebase(1).)
   176  
   177         --no-post-rewrite
   178             Bypass the post-rewrite hook.
   179  
   180         -i, --include
   181             Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well. This is usually not what you want unless you are concluding a conflicted merge.
   182  
   183         -o, --only
   184             Make a commit by taking the updated working tree contents of the paths specified on the command line, disregarding any contents that have been staged for other paths. This is the default mode of operation of git commit if
   185             any paths are given on the command line, in which case this option can be omitted. If this option is specified together with --amend, then no paths need to be specified, which can be used to amend the last commit without
   186             committing changes that have already been staged. If used together with --allow-empty paths are also not required, and an empty commit will be created.
   187  
   188         --pathspec-from-file=<file>
   189             Pathspec is passed in <file> instead of commandline args. If <file> is exactly - then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the
   190             configuration variable core.quotePath (see git-config(1)). See also --pathspec-file-nul and global --literal-pathspecs.
   191  
   192         --pathspec-file-nul
   193             Only meaningful with --pathspec-from-file. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes).
   194  
   195         -u[<mode>], --untracked-files[=<mode>]
   196             Show untracked files.
   197  
   198             The mode parameter is optional (defaults to all), and is used to specify the handling of untracked files; when -u is not used, the default is normal, i.e. show untracked files and directories.
   199  
   200             The possible options are:
   201  
   202             •   no - Show no untracked files
   203  
   204             •   normal - Shows untracked files and directories
   205  
   206             •   all - Also shows individual files in untracked directories.
   207  
   208             The default can be changed using the status.showUntrackedFiles configuration variable documented in git-config(1).
   209  
   210         -v, --verbose
   211             Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output
   212             doesn’t have its lines prefixed with #. This diff will not be a part of the commit message. See the commit.verbose configuration variable in git-config(1).
   213  
   214             If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged changes to tracked files.
   215  
   216         -q, --quiet
   217             Suppress commit summary message.
   218  
   219         --dry-run
   220             Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked.
   221  
   222         --status
   223             Include the output of git-status(1) in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status.
   224  
   225         --no-status
   226             Do not include the output of git-status(1) in the commit message template when using an editor to prepare the default commit message.
   227  
   228         -S[<keyid>], --gpg-sign[=<keyid>], --no-gpg-sign
   229             GPG-sign commits. The keyid argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space.  --no-gpg-sign is useful to countermand both commit.gpgSign
   230             configuration variable, and earlier --gpg-sign.
   231  
   232         --
   233             Do not interpret any more arguments as options.
   234  
   235         <pathspec>...
   236             When pathspec is given on the command line, commit the contents of the files that match the pathspec without recording the changes already added to the index. The contents of these files are also staged for the next commit
   237             on top of what have been staged before.
   238  
   239             For more details, see the pathspec entry in gitglossary(7).
   240  
   241  EXAMPLES
   242         When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the "index" with git add. A file can be reverted back, only in the index but not in the working
   243         tree, to that of the last commit with git restore --staged <file>, which effectively reverts git add and prevents the changes to this file from participating in the next commit. After building the state to be committed
   244         incrementally with these commands, git commit (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:
   245  
   246             $ edit hello.c
   247             $ git rm goodbye.c
   248             $ git add hello.c
   249             $ git commit
   250  
   251         Instead of staging files after each individual change, you can tell git commit to notice the changes to the files whose contents are tracked in your working tree and do corresponding git add and git rm for you. That is, this
   252         example does the same as the earlier example if there is no other change in your working tree:
   253  
   254             $ edit hello.c
   255             $ rm goodbye.c
   256             $ git commit -a
   257  
   258         The command git commit -a first looks at your working tree, notices that you have modified hello.c and removed goodbye.c, and performs necessary git add and git rm for you.
   259  
   260         After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to git commit. When pathnames are given, the command makes a commit that only records the changes made to the named
   261         paths:
   262  
   263             $ edit hello.c hello.h
   264             $ git add hello.c hello.h
   265             $ edit Makefile
   266             $ git commit Makefile
   267  
   268         This makes a commit that records the modification to Makefile. The changes staged for hello.c and hello.h are not included in the resulting commit. However, their changes are not lost — they are still staged and merely held
   269         back. After the above sequence, if you do:
   270  
   271             $ git commit
   272  
   273         this second commit would record the changes to hello.c and hello.h as expected.
   274  
   275         After a merge (initiated by git merge or git pull) stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first
   276         check which paths are conflicting with git status and after fixing them manually in your working tree, you would stage the result as usual with git add:
   277  
   278             $ git status | grep unmerged
   279             unmerged: hello.c
   280             $ edit hello.c
   281             $ git add hello.c
   282  
   283         After resolving conflicts and staging the result, git ls-files -u would stop mentioning the conflicted path. When you are done, run git commit to finally record the merge:
   284  
   285             $ git commit
   286  
   287         As with the case to record your own changes, you can use -a option to save typing. One difference is that during a merge resolution, you cannot use git commit with pathnames to alter the order the changes are committed,
   288         because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see -i option).
   289  
   290  COMMIT INFORMATION
   291         Author and committer information is taken from the following environment variables, if set:
   292  
   293             GIT_AUTHOR_NAME
   294             GIT_AUTHOR_EMAIL
   295             GIT_AUTHOR_DATE
   296             GIT_COMMITTER_NAME
   297             GIT_COMMITTER_EMAIL
   298             GIT_COMMITTER_DATE
   299  
   300         (nb "<", ">" and "\n"s are stripped)
   301  
   302         The author and committer names are by convention some form of a personal name (that is, the name by which other humans refer to you), although Git does not enforce or require any particular form. Arbitrary Unicode may be used,
   303         subject to the constraints listed above. This name has no effect on authentication; for that, see the credential.username variable in git-config(1).
   304  
   305         In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not present, the environment variable EMAIL, or, if that is not set, system user
   306         name and the hostname used for outgoing mail (taken from /etc/mailname and falling back to the fully qualified hostname when that file does not exist).
   307  
   308         The author.name and committer.name and their corresponding email options override user.name and user.email if set and are overridden themselves by the environment variables.
   309  
   310         The typical usage is to set just the user.name and user.email variables; the other options are provided for more complex use cases.
   311  
   312  DATE FORMATS
   313         The GIT_AUTHOR_DATE and GIT_COMMITTER_DATE environment variables support the following date formats:
   314  
   315         Git internal format
   316             It is <unix-timestamp> <time-zone-offset>, where <unix-timestamp> is the number of seconds since the UNIX epoch.  <time-zone-offset> is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC)
   317             is +0100.
   318  
   319         RFC 2822
   320             The standard email format as described by RFC 2822, for example Thu, 07 Apr 2005 22:13:13 +0200.
   321  
   322         ISO 8601
   323             Time and date specified by the ISO 8601 standard, for example 2005-04-07T22:13:13. The parser accepts a space instead of the T character as well. Fractional parts of a second will be ignored, for example
   324             2005-04-07T22:13:13.019 will be treated as 2005-04-07T22:13:13.
   325  
   326                 Note
   327                 In addition, the date part is accepted in the following formats: YYYY.MM.DD, MM/DD/YYYY and DD.MM.YYYY.
   328  
   329         In addition to recognizing all date formats above, the --date option will also try to make sense of other, more human-centric date formats, such as relative dates like "yesterday" or "last Friday at noon".
   330  
   331  DISCUSSION
   332         Though not required, it’s a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the
   333         first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, git-format-patch(1) turns a commit into email, and it uses the title on the Subject line and the rest of
   334         the commit in the body.
   335  
   336         Git is to some extent character encoding agnostic.
   337  
   338         •   The contents of the blob objects are uninterpreted sequences of bytes. There is no encoding translation at the core level.
   339  
   340         •   Path names are encoded in UTF-8 normalization form C. This applies to tree objects, the index file, ref names, as well as path names in command line arguments, environment variables and config files (.git/config (see git-
   341             config(1)), gitignore(5), gitattributes(5) and gitmodules(5)).
   342  
   343             Note that Git at the core level treats path names simply as sequences of non-NUL bytes, there are no path name encoding conversions (except on Mac and Windows). Therefore, using non-ASCII path names will mostly work even
   344             on platforms and file systems that use legacy extended ASCII encodings. However, repositories created on such systems will not work properly on UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. Additionally,
   345             many Git-based tools simply assume path names to be UTF-8 and will fail to display other encodings correctly.
   346  
   347         •   Commit log messages are typically encoded in UTF-8, but other extended ASCII encodings are also supported. This includes ISO-8859-x, CP125x and many others, but not UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK,
   348             Shift-JIS, Big5, EUC-x, CP9xx etc.).
   349  
   350         Although we encourage that the commit log messages are encoded in UTF-8, both the core and Git Porcelain are designed not to force UTF-8 on projects. If all participants of a particular project find it more convenient to use
   351         legacy encodings, Git does not forbid it. However, there are a few things to keep in mind.
   352  
   353          1. git commit and git commit-tree issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have
   354             i18n.commitEncoding in .git/config file, like this:
   355  
   356                 [i18n]
   357                         commitEncoding = ISO-8859-1
   358  
   359             Commit objects created with the above setting record the value of i18n.commitEncoding in its encoding header. This is to help other people who look at them later. Lack of this header implies that the commit log message is
   360             encoded in UTF-8.
   361  
   362          2. git log, git show, git blame and friends look at the encoding header of a commit object, and try to re-code the log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with
   363             i18n.logOutputEncoding in .git/config file, like this:
   364  
   365                 [i18n]
   366                         logOutputEncoding = ISO-8859-1
   367  
   368             If you do not have this configuration variable, the value of i18n.commitEncoding is used instead.
   369  
   370         Note that we deliberately chose not to re-code the commit log message when a commit is made to force UTF-8 at the commit object level, because re-coding to UTF-8 is not necessarily a reversible operation.
   371  
   372  ENVIRONMENT AND CONFIGURATION VARIABLES
   373         The editor used to edit the commit log message will be chosen from the GIT_EDITOR environment variable, the core.editor configuration variable, the VISUAL environment variable, or the EDITOR environment variable (in that
   374         order). See git-var(1) for details.
   375  
   376         Everything above this line in this section isn’t included from the git-config(1) documentation. The content that follows is the same as what’s found there:
   377  
   378         commit.cleanup
   379             This setting overrides the default of the --cleanup option in git commit. See git-commit(1) for details. Changing the default can be useful when you always want to keep lines that begin with comment character # in your log
   380             message, in which case you would do git config commit.cleanup whitespace (note that you will have to remove the help lines that begin with # in the commit log template yourself, if you do this).
   381  
   382         commit.gpgSign
   383             A boolean to specify whether all commits should be GPG signed. Use of this option when doing operations such as rebase can result in a large number of commits being signed. It may be convenient to use an agent to avoid
   384             typing your GPG passphrase several times.
   385  
   386         commit.status
   387             A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit message. Defaults to true.
   388  
   389         commit.template
   390             Specify the pathname of a file to use as the template for new commit messages.
   391  
   392         commit.verbose
   393             A boolean or int to specify the level of verbose with git commit. See git-commit(1).
   394  
   395  HOOKS
   396         This command can run commit-msg, prepare-commit-msg, pre-commit, post-commit and post-rewrite hooks. See githooks(5) for more information.
   397  
   398  FILES
   399         $GIT_DIR/COMMIT_EDITMSG
   400             This file contains the commit message of a commit in progress. If git commit exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be
   401             available in this file, but will be overwritten by the next invocation of git commit.
   402  
   403  SEE ALSO
   404         git-add(1), git-rm(1), git-mv(1), git-merge(1), git-commit-tree(1)
   405  
   406  GIT
   407         Part of the git(1) suite
   408  
   409  Git 2.41.0                                                                                                      07/24/2023                                                                                                  GIT-COMMIT(1)