aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-20 17:07:04 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-20 17:07:04 -0800
commit28f04f34636f46f7848be9ce9b36cec6d3554f32 (patch)
treec4cb95bf6aaca52f84c675a90dae539941bd162c /Documentation/git-commit.txt
parent577f63e781d2f9b9a6862389b6e9d2ca2467afa2 (diff)
parent51fb3a3dfa4ffeeb210fb0e7d6f631503a5a1dfb (diff)
downloadgit-28f04f34636f46f7848be9ce9b36cec6d3554f32.tar.xz
Merge branch 'rt/commit-cleanup-config'
Add a configuration variable to set default clean-up mode other than "strip". * rt/commit-cleanup-config: commit: make default of "cleanup" option configurable
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r--Documentation/git-commit.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 7bdb039d5e..41b27da325 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -179,7 +179,9 @@ OPTIONS
only if the message is to be edited. Otherwise only whitespace
removed. The 'verbatim' mode does not change message at all,
'whitespace' removes just leading/trailing whitespace lines
- and 'strip' removes both whitespace and commentary.
+ and 'strip' removes both whitespace and commentary. The default
+ can be changed by the 'commit.cleanup' configuration variable
+ (see linkgit:git-config[1]).
-e::
--edit::