summaryrefslogtreecommitdiff
path: root/Documentation/git-commit-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-13 20:18:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-13 20:18:27 (GMT)
commit50b26f561298c58029d408f4b0c5bca20b7806a3 (patch)
tree9a5440e459fc8e88c75cf633c8150bd6c47704b1 /Documentation/git-commit-tree.txt
parent17130a704620c0e5455ef0f362f8d0f40758d1ea (diff)
parent6694856153f85cb552cc92d75ddeabf5bdec4f20 (diff)
downloadgit-50b26f561298c58029d408f4b0c5bca20b7806a3.zip
git-50b26f561298c58029d408f4b0c5bca20b7806a3.tar.gz
git-50b26f561298c58029d408f4b0c5bca20b7806a3.tar.bz2
Merge branch 'jc/commit-tree-ignore-commit-gpgsign'
"git commit-tree" plumbing command required the user to always sign its result when the user sets the commit.gpgsign configuration variable, which was an ancient mistake. Rework "git rebase" that relied on this mistake so that it reads commit.gpgsign and pass (or not pass) the -S option to "git commit-tree" to keep the end-user expectation the same, while teaching "git commit-tree" to ignore the configuration variable. This will stop requiring the users to sign commit objects used internally as an implementation detail of "git stash". * jc/commit-tree-ignore-commit-gpgsign: commit-tree: do not pay attention to commit.gpgsign
Diffstat (limited to 'Documentation/git-commit-tree.txt')
-rw-r--r--Documentation/git-commit-tree.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 48c33d7..cb69faa 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -61,8 +61,8 @@ OPTIONS
stuck to the option without a space.
--no-gpg-sign::
- Countermand `commit.gpgSign` configuration variable that is
- set to force each and every commit to be signed.
+ Do not GPG-sign commit, to countermand a `--gpg-sign` option
+ given earlier on the command line.
Commit Information