diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-19 13:17:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-19 13:17:53 -0700 |
| commit | 3e199decd5c02092d3e458be6be10874e12a51dd (patch) | |
| tree | 9b881f2aae62816ec10a33f1e593ad8b45248bcf /Documentation | |
| parent | 05c39674f35f33b6d2311da6c63268b9e7739840 (diff) | |
| parent | 9a35c14d64c3f76f99dd2853077e27cde2a30db7 (diff) | |
| download | git-3e199decd5c02092d3e458be6be10874e12a51dd.tar.gz git-3e199decd5c02092d3e458be6be10874e12a51dd.tar.xz | |
Merge branch 'fg/document-commit-message-stripping'
* fg/document-commit-message-stripping:
Documentation: clarify how "git commit" cleans up the edited log message
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-commit.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 617e29b38..617dea083 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -180,8 +180,8 @@ OPTIONS + -- strip:: - Strip leading and trailing empty lines, trailing whitespace, and - #commentary and collapse consecutive empty lines. + Strip leading and trailing empty lines, trailing whitespace, + commentary and collapse consecutive empty lines. whitespace:: Same as `strip` except #commentary is not removed. verbatim:: @@ -282,8 +282,11 @@ configuration variable documented in linkgit:git-config[1]. --verbose:: Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message - template. Note that this diff output doesn't have its - lines prefixed with '#'. + template to help the user describe the commit by reminding + what changes the commit has. + Note that this diff output doesn't have its + lines prefixed with '#'. This diff will not be a part + of the commit message. + If specified twice, show in addition the unified diff between what would be committed and the worktree files, i.e. the unstaged |