Merge branch 'rv/sendemail-tocmd-in-config-and-completion'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:32 +0000 (11:06 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Nov 2017 02:06:32 +0000 (11:06 +0900)
Teach "sendemail.tocmd" to places that know about "sendemail.to",
like documentation and shell completion (in contrib/).

* rv/sendemail-tocmd-in-config-and-completion:
completion: add git config sendemail.tocmd
Documentation/config: add sendemail.tocmd to list preceding "See git-send-email(1)"

1  2 
Documentation/config.txt
contrib/completion/git-completion.bash
diff --combined Documentation/config.txt
index 5f65fa92348385236f79091e944d17c65d7cf489,d88fc9f6359d4bdf37f50b7516efe3d092f6af91..531649cb40eab1749928bfacce8fa2ec0f24d065
@@@ -416,13 -416,6 +416,13 @@@ core.protectNTFS:
        8.3 "short" names.
        Defaults to `true` on Windows, and `false` elsewhere.
  
 +core.fsmonitor::
 +      If set, the value of this variable is used as a command which
 +      will identify all files that may have changed since the
 +      requested date/time. This information is used to speed up git by
 +      avoiding unnecessary processing of files that have not changed.
 +      See the "fsmonitor-watchman" section of linkgit:githooks[5].
 +
  core.trustctime::
        If false, the ctime differences between the index and the
        working tree are ignored; useful when the inode change time
@@@ -3007,6 -3000,7 +3007,7 @@@ sendemail.smtpPass:
  sendemail.suppresscc::
  sendemail.suppressFrom::
  sendemail.to::
+ sendemail.tocmd::
  sendemail.smtpDomain::
  sendemail.smtpServer::
  sendemail.smtpServerPort::
index 38d5e4a909f0386be18eeb0d3eec768d95dcc74f,10607cdf2b21233d8f8d4fd9ac54ac1e0021b124..6f890c0f502f090ebaf5387fd2c54aa822bf59f9
@@@ -111,7 -111,8 +111,7 @@@ __git (
  #   GNU General Public License for more details.
  #
  #   You should have received a copy of the GNU General Public License
 -#   along with this program; if not, write to the Free Software Foundation,
 -#   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +#   along with this program; if not, see <http://www.gnu.org/licenses/>.
  #
  #   The latest version of this software can be obtained here:
  #
@@@ -1400,7 -1401,7 +1400,7 @@@ __git_diff_common_options="--stat --num
                        --patch-with-stat --name-only --name-status --color
                        --no-color --color-words --no-renames --check
                        --full-index --binary --abbrev --diff-filter=
 -                      --find-copies-harder
 +                      --find-copies-harder --ignore-cr-at-eol
                        --text --ignore-space-at-eol --ignore-space-change
                        --ignore-all-space --ignore-blank-lines --exit-code
                        --quiet --ext-diff --no-ext-diff
@@@ -2641,6 -2642,7 +2641,7 @@@ _git_config (
                sendemail.suppressfrom
                sendemail.thread
                sendemail.to
+               sendemail.tocmd
                sendemail.validate
                sendemail.smtpbatchsize
                sendemail.smtprelogindelay