Signed-off-by: Steven Drake <sdrake@xxxxxxxxxx>
---
Documentation/config.txt | 4 ++++
Documentation/git-commit.txt | 2 +-
builtin-commit.c | 4 ++++
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 23a965e..dd261cf 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -712,6 +712,10 @@ color.ui::
terminal. When more specific variables of color.* are set, they always
take precedence over this setting. Defaults to false.
+commit.signoff::
+ Add Signed-off-by line by the committer at the end of the commit
+ log message.
+
commit.template::
Specify a file to use as the template for new commit messages.
"{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index c97c151..5a977b6 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -114,7 +114,7 @@ OPTIONS
-s::
--signoff::
Add Signed-off-by line by the committer at the end of the commit
- log message.
+ log message. This overrides the `commit.signoff` configuration variable.
-n::
--no-verify::
diff --git a/builtin-commit.c b/builtin-commit.c
index 3dfcd77..db90e7a 100644
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -1093,6 +1093,10 @@ static int git_commit_config(const char *k, const char *v, void *cb)
if (!strcmp(k, "commit.template"))
return git_config_pathname(&template_file, k, v);
+ if (!strcmp(k, "commit.signoff")) {
+ signoff = git_config_bool(k, v);
+ return 0;
+ }
return git_status_config(k, v, s);
}
--
1.6.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html