diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-13 13:18:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-13 13:18:27 -0700 |
| commit | 50b26f561298c58029d408f4b0c5bca20b7806a3 (patch) | |
| tree | 9a5440e459fc8e88c75cf633c8150bd6c47704b1 /Documentation/git-commit-tree.txt | |
| parent | 17130a704620c0e5455ef0f362f8d0f40758d1ea (diff) | |
| parent | 6694856153f85cb552cc92d75ddeabf5bdec4f20 (diff) | |
| download | git-50b26f561298c58029d408f4b0c5bca20b7806a3.tar.gz | |
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.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 48c33d7ed7..cb69faab68 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 |