From 26e590af87e1a4283ac0668cc1386493576f703b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 17 Feb 2008 03:53:51 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4.1-183-gf873 --- config.txt | 45 +++++ git-commit.html | 6 +- git-commit.txt | 4 +- git-config.html | 48 +++++- git-help.html | 54 +----- git-help.txt | 26 +-- git-instaweb.html | 13 +- git-instaweb.txt | 12 +- git-reset.html | 40 ++++- git-reset.txt | 23 ++- git-web--browse.html | 396 +++++++++++++++++++++++++++++++++++++++++++ git-web--browse.txt | 78 +++++++++ gitattributes.html | 32 +++- gitattributes.txt | 20 +++ gitignore.html | 12 +- gitignore.txt | 7 + hooks.html | 25 ++- hooks.txt | 29 ++++ 18 files changed, 773 insertions(+), 97 deletions(-) create mode 100644 git-web--browse.html create mode 100644 git-web--browse.txt diff --git a/config.txt b/config.txt index f9bdb164e..f2f6a774e 100644 --- a/config.txt +++ b/config.txt @@ -139,6 +139,51 @@ core.autocrlf:: "text" (i.e. be subjected to the autocrlf mechanism) is decided purely based on the contents. +core.safecrlf:: + If true, makes git check if converting `CRLF` as controlled by + `core.autocrlf` is reversible. Git will verify if a command + modifies a file in the work tree either directly or indirectly. + For example, committing a file followed by checking out the + same file should yield the original file in the work tree. If + this is not the case for the current setting of + `core.autocrlf`, git will reject the file. The variable can + be set to "warn", in which case git will only warn about an + irreversible conversion but continue the operation. ++ +CRLF conversion bears a slight chance of corrupting data. +autocrlf=true will convert CRLF to LF during commit and LF to +CRLF during checkout. A file that contains a mixture of LF and +CRLF before the commit cannot be recreated by git. For text +files this is the right thing to do: it corrects line endings +such that we have only LF line endings in the repository. +But for binary files that are accidentally classified as text the +conversion can corrupt data. ++ +If you recognize such corruption early you can easily fix it by +setting the conversion type explicitly in .gitattributes. Right +after committing you still have the original file in your work +tree and this file is not yet corrupted. You can explicitly tell +git that this file is binary and git will handle the file +appropriately. ++ +Unfortunately, the desired effect of cleaning up text files with +mixed line endings and the undesired effect of corrupting binary +files cannot be distinguished. In both cases CRLFs are removed +in an irreversible way. For text files this is the right thing +to do because CRLFs are line endings, while for binary files +converting CRLFs corrupts data. ++ +Note, this safety check does not mean that a checkout will generate a +file identical to the original file for a different setting of +`core.autocrlf`, but only for the current one. For example, a text +file with `LF` would be accepted with `core.autocrlf=input` and could +later be checked out with `core.autocrlf=true`, in which case the +resulting file would contain `CRLF`, although the original file +contained `LF`. However, in both work trees the line endings would be +consistent, that is either all `LF` or all `CRLF`, but never mixed. A +file with mixed line endings would be reported by the `core.safecrlf` +mechanism. + core.symlinks:: If false, symbolic links are checked out as small plain files that contain the link text. linkgit:git-update-index[1] and diff --git a/git-commit.html b/git-commit.html index 9842b70d2..5e7e4aaf0 100644 --- a/git-commit.html +++ b/git-commit.html @@ -707,8 +707,8 @@ order).

HOOKS

-

This command can run commit-msg, pre-commit, and -post-commit hooks. See hooks for more +

This command can run commit-msg, prepare-commit-msg, pre-commit, +and post-commit hooks. See hooks for more information.

SEE ALSO

@@ -730,7 +730,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index c3725b2ed..b4ae61ff4 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -280,8 +280,8 @@ order). HOOKS ----- -This command can run `commit-msg`, `pre-commit`, and -`post-commit` hooks. See link:hooks.html[hooks] for more +This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, +and `post-commit` hooks. See link:hooks.html[hooks] for more information. diff --git a/git-config.html b/git-config.html index 9f6e96bd5..95a9a3d67 100644 --- a/git-config.html +++ b/git-config.html @@ -849,6 +849,52 @@ core.autocrlf

+core.safecrlf +
+
+

+ If true, makes git check if converting CRLF as controlled by + core.autocrlf is reversible. Git will verify if a command + modifies a file in the work tree either directly or indirectly. + For example, committing a file followed by checking out the + same file should yield the original file in the work tree. If + this is not the case for the current setting of + core.autocrlf, git will reject the file. The variable can + be set to "warn", in which case git will only warn about an + irreversible conversion but continue the operation. +

+

CRLF conversion bears a slight chance of corrupting data. +autocrlf=true will convert CRLF to LF during commit and LF to +CRLF during checkout. A file that contains a mixture of LF and +CRLF before the commit cannot be recreated by git. For text +files this is the right thing to do: it corrects line endings +such that we have only LF line endings in the repository. +But for binary files that are accidentally classified as text the +conversion can corrupt data.

+

If you recognize such corruption early you can easily fix it by +setting the conversion type explicitly in .gitattributes. Right +after committing you still have the original file in your work +tree and this file is not yet corrupted. You can explicitly tell +git that this file is binary and git will handle the file +appropriately.

+

Unfortunately, the desired effect of cleaning up text files with +mixed line endings and the undesired effect of corrupting binary +files cannot be distinguished. In both cases CRLFs are removed +in an irreversible way. For text files this is the right thing +to do because CRLFs are line endings, while for binary files +converting CRLFs corrupts data.

+

Note, this safety check does not mean that a checkout will generate a +file identical to the original file for a different setting of +core.autocrlf, but only for the current one. For example, a text +file with LF would be accepted with core.autocrlf=input and could +later be checked out with core.autocrlf=true, in which case the +resulting file would contain CRLF, although the original file +contained LF. However, in both work trees the line endings would be +consistent, that is either all LF or all CRLF, but never mixed. A +file with mixed line endings would be reported by the core.safecrlf +mechanism.

+
+
core.symlinks
@@ -2220,7 +2266,7 @@ web.browser diff --git a/git-help.html b/git-help.html index ea4193bc2..f90a143fa 100644 --- a/git-help.html +++ b/git-help.html @@ -328,53 +328,9 @@ former is internally converted into the latter.

The web browser can be specified using the configuration variable help.browser, or web.browser if the former is not set. If none of -these config variables is set, the git-help--browse helper script -(called by git-help) will pick a suitable default.

-

You can explicitly provide a full path to your preferred browser by -setting the configuration variable browser.<tool>.path. For example, -you can configure the absolute path to firefox by setting -browser.firefox.path. Otherwise, git-help--browse assumes the tool -is available in PATH.

-

Note that the script tries, as much as possible, to display the HTML -page in a new tab on an already opened browser.

-

The following browsers are currently supported by git-help--browse:

- +these config variables is set, the git-web--browse helper script +(called by git-help) will pick a suitable default. See +git-web--browse(1) for more information about this.

@@ -404,7 +360,7 @@ line option:

The help.browser, web.browser and browser.<tool>.path will also be checked if the web format is chosen (either by command line option or configuration variable). See -w|--web in the OPTIONS -section above.

+section above and git-web--browse(1).

Note that these configuration variables should probably be set using the --global flag, for example like this:

@@ -432,7 +388,7 @@ little. Maintenance is done by the git-list <git@vger.kernel.org>.

diff --git a/git-help.txt b/git-help.txt index fb77ca3a5..0926dc12b 100644 --- a/git-help.txt +++ b/git-help.txt @@ -47,27 +47,9 @@ OPTIONS + The web browser can be specified using the configuration variable 'help.browser', or 'web.browser' if the former is not set. If none of -these config variables is set, the 'git-help--browse' helper script -(called by 'git-help') will pick a suitable default. -+ -You can explicitly provide a full path to your preferred browser by -setting the configuration variable 'browser..path'. For example, -you can configure the absolute path to firefox by setting -'browser.firefox.path'. Otherwise, 'git-help--browse' assumes the tool -is available in PATH. -+ -Note that the script tries, as much as possible, to display the HTML -page in a new tab on an already opened browser. -+ -The following browsers are currently supported by 'git-help--browse': -+ -* firefox (this is the default under X Window when not using KDE) -* iceweasel -* konqueror (this is the default under KDE) -* w3m (this is the default outside X Window) -* links -* lynx -* dillo +these config variables is set, the 'git-web--browse' helper script +(called by 'git-help') will pick a suitable default. See +linkgit:git-web--browse[1] for more information about this. CONFIGURATION VARIABLES ----------------------- @@ -84,7 +66,7 @@ line option: The 'help.browser', 'web.browser' and 'browser..path' will also be checked if the 'web' format is chosen (either by command line option or configuration variable). See '-w|--web' in the OPTIONS -section above. +section above and linkgit:git-web--browse[1]. Note that these configuration variables should probably be set using the '--global' flag, for example like this: diff --git a/git-instaweb.html b/git-instaweb.html index cdcb2c08d..13d9b3324 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -327,9 +327,11 @@ repository.

- The web browser command-line to execute to view the gitweb page. - If blank, the URL of the gitweb instance will be printed to - stdout. (Default: firefox) + The web browser that should be used to view the gitweb + page. This will be passed to the git-web--browse helper + script along with the URL of the gitweb instance. See + git-web--browse(1) for more information about this. If + the script fails, the URL will be printed to stdout.

@@ -376,7 +378,8 @@ repository.

If the configuration variable instaweb.browser is not set, -web.browser will be used instead if it is defined.

+web.browser will be used instead if it is defined. See +git-web--browse(1) for more information about this.

Author

@@ -392,7 +395,7 @@ repository.

diff --git a/git-instaweb.txt b/git-instaweb.txt index 841e8fac7..51f1532ef 100644 --- a/git-instaweb.txt +++ b/git-instaweb.txt @@ -38,10 +38,11 @@ OPTIONS The port number to bind the httpd to. (Default: 1234) -b|--browser:: - - The web browser command-line to execute to view the gitweb page. - If blank, the URL of the gitweb instance will be printed to - stdout. (Default: 'firefox') + The web browser that should be used to view the gitweb + page. This will be passed to the 'git-web--browse' helper + script along with the URL of the gitweb instance. See + linkgit:git-web--browse[1] for more information about this. If + the script fails, the URL will be printed to stdout. --start:: Start the httpd instance and exit. This does not generate @@ -72,7 +73,8 @@ You may specify configuration in your .git/config ----------------------------------------------------------------------- If the configuration variable 'instaweb.browser' is not set, -'web.browser' will be used instead if it is defined. +'web.browser' will be used instead if it is defined. See +linkgit:git-web--browse[1] for more information about this. Author ------ diff --git a/git-reset.html b/git-reset.html index 41a8ce6b0..3dbe86675 100644 --- a/git-reset.html +++ b/git-reset.html @@ -273,8 +273,8 @@ git-reset(1) Manual Page

SYNOPSIS

-
git-reset [--mixed | --soft | --hard] [-q] [<commit>] -git-reset [--mixed] [-q] [<commit>] [--] <paths>…
+
git reset [--mixed | --soft | --hard] [-q] [<commit>] +git reset [-q] [<commit>] [--] <paths>…

DESCRIPTION

@@ -308,7 +308,7 @@ the index from a given commit, without moving HEAD.

Does not touch the index file nor the working tree at all, but requires them to be in a good order. This leaves all your changed - files "Added but not yet committed", as git-status(1) would + files "Changes to be committed", as git-status(1) would put it.

@@ -559,6 +559,38 @@ At this point the index file still has all the WIP changes you +
+Reset a single file in the index +
+
+

Suppose you have added a file to your index, but later decide you do not +want to add it to your commit. You can remove the file from the index +while keeping your changes with git reset.

+
+
+
$ git reset -- frotz.c                      (1)
+$ git commit -m "Commit files in index"     (2)
+$ git add frotz.c                           (3)
+
+
    +
  1. +

    +This removes the file from the index while keeping it in the working + directory. +

    +
    2. +
  2. +

    +This commits all other changes in the index. +

    +
    3. +
  3. +

    +Adds the file to the index again. +

    +
    4. +
+

Author

@@ -575,7 +607,7 @@ At this point the index file still has all the WIP changes you diff --git a/git-reset.txt b/git-reset.txt index a4e0a779d..fac59c972 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -8,8 +8,8 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git-reset' [--mixed | --soft | --hard] [-q] [] -'git-reset' [--mixed] [-q] [] [--] ... +'git reset' [--mixed | --soft | --hard] [-q] [] +'git reset' [-q] [] [--] ... DESCRIPTION ----------- @@ -37,7 +37,7 @@ OPTIONS --soft:: Does not touch the index file nor the working tree at all, but requires them to be in a good order. This leaves all your changed - files "Added but not yet committed", as linkgit:git-status[1] would + files "Changes to be committed", as linkgit:git-status[1] would put it. --hard:: @@ -176,6 +176,23 @@ $ git reset <3> committed as 'snapshot WIP'. This updates the index to show your WIP files as uncommitted. +Reset a single file in the index:: ++ +Suppose you have added a file to your index, but later decide you do not +want to add it to your commit. You can remove the file from the index +while keeping your changes with git reset. ++ +------------ +$ git reset -- frotz.c <1> +$ git commit -m "Commit files in index" <2> +$ git add frotz.c <3> +------------ ++ +<1> This removes the file from the index while keeping it in the working + directory. +<2> This commits all other changes in the index. +<3> Adds the file to the index again. + Author ------ Written by Junio C Hamano and Linus Torvalds diff --git a/git-web--browse.html b/git-web--browse.html new file mode 100644 index 000000000..902d6bc42 --- /dev/null +++ b/git-web--browse.html @@ -0,0 +1,396 @@ + + + + + + +git-web--browse(1) + + + +

SYNOPSIS

+
+

git-web--browse [OPTIONS] URL/FILE …

+
+

DESCRIPTION

+
+

This script tries, as much as possible, to display the URLs and FILEs +that are passed as arguments, as HTML pages in new tabs on an already +opened web browser.

+

The following browsers (or commands) are currently supported:

+
    +
  • +

    +firefox (this is the default under X Window when not using KDE) +

    +
    • +
  • +

    +iceweasel +

    +
    • +
  • +

    +konqueror (this is the default under KDE) +

    +
    • +
  • +

    +w3m (this is the default outside graphical environments) +

    +
    • +
  • +

    +links +

    +
    • +
  • +

    +lynx +

    +
    • +
  • +

    +dillo +

    +
    • +
  • +

    +open (this is the default under Mac OS X GUI) +

    +
    • +
+
+

OPTIONS

+
+
+
+-b BROWSER|--browser=BROWSER +
+
+

+ Use the specified BROWSER. It must be in the list of supported + browsers. +

+
+
+-t BROWSER|--tool=BROWSER +
+
+

+ Same as above. +

+
+
+-c CONF.VAR|--config=CONF.VAR +
+
+

+ CONF.VAR is looked up in the git config files. If it's set, + then its value specify the browser that should be used. +

+
+
+
+

CONFIGURATION VARIABLES

+
+

The web browser can be specified using a configuration variable passed +with the -c (or --config) command line option, or the web.browser +configuration variable if the former is not used.

+

You can explicitly provide a full path to your preferred browser by +setting the configuration variable browser.<tool>.path. For example, +you can configure the absolute path to firefox by setting +browser.firefox.path. Otherwise, git-web--browse assumes the tool +is available in PATH.

+

Note that these configuration variables should probably be set using +the --global flag, for example like this:

+
+
+
$ git config --global web.browser firefox
+
+

as they are probably more user specific than repository specific. +See git-config(1) for more information about this.

+
+

Author

+
+

Written by Christian Couder <chriscool@tuxfamily.org> and the git-list +<git@vger.kernel.org>, based on git-mergetool by Theodore Y. Ts'o.

+
+

Documentation

+
+

Documentation by Christian Couder <chriscool@tuxfamily.org> and the +git-list <git@vger.kernel.org>.

+
+

GIT

+
+

Part of the git(7) suite

+
+ + + diff --git a/git-web--browse.txt b/git-web--browse.txt new file mode 100644 index 000000000..df57d010e --- /dev/null +++ b/git-web--browse.txt @@ -0,0 +1,78 @@ +git-web--browse(1) +================== + +NAME +---- +git-web--browse - git helper script to launch a web browser + +SYNOPSIS +-------- +'git-web--browse' [OPTIONS] URL/FILE ... + +DESCRIPTION +----------- + +This script tries, as much as possible, to display the URLs and FILEs +that are passed as arguments, as HTML pages in new tabs on an already +opened web browser. + +The following browsers (or commands) are currently supported: + +* firefox (this is the default under X Window when not using KDE) +* iceweasel +* konqueror (this is the default under KDE) +* w3m (this is the default outside graphical environments) +* links +* lynx +* dillo +* open (this is the default under Mac OS X GUI) + +OPTIONS +------- +-b BROWSER|--browser=BROWSER:: + Use the specified BROWSER. It must be in the list of supported + browsers. + +-t BROWSER|--tool=BROWSER:: + Same as above. + +-c CONF.VAR|--config=CONF.VAR:: + CONF.VAR is looked up in the git config files. If it's set, + then its value specify the browser that should be used. + +CONFIGURATION VARIABLES +----------------------- + +The web browser can be specified using a configuration variable passed +with the -c (or --config) command line option, or the 'web.browser' +configuration variable if the former is not used. + +You can explicitly provide a full path to your preferred browser by +setting the configuration variable 'browser..path'. For example, +you can configure the absolute path to firefox by setting +'browser.firefox.path'. Otherwise, 'git-web--browse' assumes the tool +is available in PATH. + +Note that these configuration variables should probably be set using +the '--global' flag, for example like this: + +------------------------------------------------ +$ git config --global web.browser firefox +------------------------------------------------ + +as they are probably more user specific than repository specific. +See linkgit:git-config[1] for more information about this. + +Author +------ +Written by Christian Couder and the git-list +, based on git-mergetool by Theodore Y. Ts'o. + +Documentation +------------- +Documentation by Christian Couder and the +git-list . + +GIT +--- +Part of the linkgit:git[7] suite diff --git a/gitattributes.html b/gitattributes.html index 57ba80387..87d8a7c84 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -412,6 +412,36 @@ in to the repository.

When core.autocrlf is set to "input", line endings are converted to LF upon checkin, but there is no conversion done upon checkout.

+

If core.safecrlf is set to "true" or "warn", git verifies if +the conversion is reversible for the current setting of +core.autocrlf. For "true", git rejects irreversible +conversions; for "warn", git only prints a warning but accepts +an irreversible conversion. The safety triggers to prevent such +a conversion done to the files in the work tree, but there are a +few exceptions. Even though…

+
    +
  • +

    +"git add" itself does not touch the files in the work tree, the + next checkout would, so the safety triggers; +

    +
    • +
  • +

    +"git apply" to update a text file with a patch does touch the files + in the work tree, but the operation is about text files and CRLF + conversion is about fixing the line ending inconsistencies, so the + safety does not trigger; +

    +
    • +
  • +

    +"git diff" itself does not touch the files in the work tree, it is + often run to inspect the changes you intend to next "git add". To + catch potential problems early, safety triggers. +

    +
    • +

ident

When the attribute ident is set to a path, git replaces $Id$ in the blob object with $Id:, followed by @@ -787,7 +817,7 @@ commit hash.

diff --git a/gitattributes.txt b/gitattributes.txt index 35a29fd60..84ec9623a 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -133,6 +133,26 @@ When `core.autocrlf` is set to "input", line endings are converted to LF upon checkin, but there is no conversion done upon checkout. +If `core.safecrlf` is set to "true" or "warn", git verifies if +the conversion is reversible for the current setting of +`core.autocrlf`. For "true", git rejects irreversible +conversions; for "warn", git only prints a warning but accepts +an irreversible conversion. The safety triggers to prevent such +a conversion done to the files in the work tree, but there are a +few exceptions. Even though... + +- "git add" itself does not touch the files in the work tree, the + next checkout would, so the safety triggers; + +- "git apply" to update a text file with a patch does touch the files + in the work tree, but the operation is about text files and CRLF + conversion is about fixing the line ending inconsistencies, so the + safety does not trigger; + +- "git diff" itself does not touch the files in the work tree, it is + often run to inspect the changes you intend to next "git add". To + catch potential problems early, safety triggers. + `ident` ^^^^^^^ diff --git a/gitignore.html b/gitignore.html index 199f8c66a..36f952cbc 100644 --- a/gitignore.html +++ b/gitignore.html @@ -343,6 +343,16 @@ An optional prefix ! which negates the pattern; any

  • +If the pattern ends with a slash, it is removed for the + purpose of the following description, but it would only find + a match with a directory. In other words, foo/ will match a + directory foo and paths underneath it, but will not match a + regular file or a symbolic link foo (this is consistent + with the way how pathspec works in general in git). +

    +
    • +
  • +

    If the pattern does not contain a slash /, git treats it as a shell glob pattern and checks for a match against the pathname without leading directories. @@ -412,7 +422,7 @@ Frank Lichtenheld, and the git-list <git@vger.kernel.org>.

    diff --git a/gitignore.txt b/gitignore.txt index 08373f52b..e847b3ba6 100644 --- a/gitignore.txt +++ b/gitignore.txt @@ -57,6 +57,13 @@ Patterns have the following format: included again. If a negated pattern matches, this will override lower precedence patterns sources. + - If the pattern ends with a slash, it is removed for the + purpose of the following description, but it would only find + a match with a directory. In other words, `foo/` will match a + directory `foo` and paths underneath it, but will not match a + regular file or a symbolic link `foo` (this is consistent + with the way how pathspec works in general in git). + - If the pattern does not contain a slash '/', git treats it as a shell glob pattern and checks for a match against the pathname without leading directories. diff --git a/hooks.html b/hooks.html index 7a4086d98..912957de6 100644 --- a/hooks.html +++ b/hooks.html @@ -312,6 +312,29 @@ causes the git-commit to abort.

    The default pre-commit hook, when enabled, catches introduction of lines with trailing whitespaces and aborts the commit when such a line is found.

    +

    All the git-commit hooks are invoked with the environment +variable GIT_EDITOR=: if the command will not bring up an editor +to modify the commit message.

    + +

    prepare-commit-msg

    +
    +

    This hook is invoked by git-commit right after preparing the +default log message, and before the editor is started.

    +

    It takes one to three parameters. The first is the name of the file +that the commit log message. The second is the source of the commit +message, and can be: message (if a \-m or \-F option was +given); template (if a \-t option was given or the +configuration option commit.template is set); merge (if the +commit is a merge or a .git/MERGE_MSG file exists); squash +(if a .git/SQUASH_MSG file exists); or commit, followed by +a commit SHA1 (if a \-c, \-C or --amend option was given).

    +

    If the exit status is non-zero, git-commit will abort.

    +

    The purpose of the hook is to edit the message file in place, and +it is not suppressed by the --no-verify option. A non-zero exit +means a failure of the hook and aborts the commit. It should not +be used as replacement for pre-commit hook.

    +

    The sample prepare-commit-msg hook that comes with git comments +out the Conflicts: part of a merge's commit message.

    commit-msg

    @@ -479,7 +502,7 @@ for the user.

    diff --git a/hooks.txt b/hooks.txt index f110162b0..76b8d7746 100644 --- a/hooks.txt +++ b/hooks.txt @@ -61,6 +61,35 @@ The default 'pre-commit' hook, when enabled, catches introduction of lines with trailing whitespaces and aborts the commit when such a line is found. +All the `git-commit` hooks are invoked with the environment +variable `GIT_EDITOR=:` if the command will not bring up an editor +to modify the commit message. + +prepare-commit-msg +------------------ + +This hook is invoked by `git-commit` right after preparing the +default log message, and before the editor is started. + +It takes one to three parameters. The first is the name of the file +that the commit log message. The second is the source of the commit +message, and can be: `message` (if a `\-m` or `\-F` option was +given); `template` (if a `\-t` option was given or the +configuration option `commit.template` is set); `merge` (if the +commit is a merge or a `.git/MERGE_MSG` file exists); `squash` +(if a `.git/SQUASH_MSG` file exists); or `commit`, followed by +a commit SHA1 (if a `\-c`, `\-C` or `\--amend` option was given). + +If the exit status is non-zero, `git-commit` will abort. + +The purpose of the hook is to edit the message file in place, and +it is not suppressed by the `\--no-verify` option. A non-zero exit +means a failure of the hook and aborts the commit. It should not +be used as replacement for pre-commit hook. + +The sample `prepare-commit-msg` hook that comes with git comments +out the `Conflicts:` part of a merge's commit message. + commit-msg ---------- -- 2.26.2