From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 May 2016 20:18:27 +0000 (-0700)
Subject: Merge branch 'jc/commit-tree-ignore-commit-gpgsign'
X-Git-Tag: v2.9.0-rc0~48
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/50b26f561298c58029d408f4b0c5bca20b7806a3

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
---

50b26f561298c58029d408f4b0c5bca20b7806a3
diff --cc Documentation/git-commit-tree.txt
index 48c33d7ed7,eb273c3d8a..cb69faab68
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@@ -56,13 -56,11 +56,13 @@@ OPTION
  
  -S[<keyid>]::
  --gpg-sign[=<keyid>]::
 -	GPG-sign commit.
 +	GPG-sign commits. The `keyid` argument is optional and
 +	defaults to the committer identity; if specified, it must be
 +	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