diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-11-10 15:01:12 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-10 15:01:12 +0900 |
commit | 3a9c034734bf5aa3e3b139e72a6b0b96ddf0b3e9 (patch) | |
tree | 53a0176d8d930235e125d80c7705681f80bf1957 /config.txt | |
parent | a65b67605da51cd9b94659acdac8984dd205dcc7 (diff) | |
download | git-htmldocs-3a9c034734bf5aa3e3b139e72a6b0b96ddf0b3e9.tar.gz |
Autogenerated HTML docs for v2.15.0-164-g4123b
Diffstat (limited to 'config.txt')
-rw-r--r-- | config.txt | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/config.txt b/config.txt index 1ac0ae6ad..671fcbaa0 100644 --- a/config.txt +++ b/config.txt @@ -351,6 +351,9 @@ advice.*:: addEmbeddedRepo:: Advice on what to do when you've accidentally added one git repo inside of another. + ignoredHook:: + Advice shown if an hook is ignored because the hook is not + set as executable. -- core.fileMode:: @@ -949,6 +952,23 @@ apply.whitespace:: Tells 'git apply' how to handle whitespaces, in the same way as the `--whitespace` option. See linkgit:git-apply[1]. +blame.showRoot:: + Do not treat root commits as boundaries in linkgit:git-blame[1]. + This option defaults to false. + +blame.blankBoundary:: + Show blank commit object name for boundary commits in + linkgit:git-blame[1]. This option defaults to false. + +blame.showEmail:: + Show the author email instead of author name in linkgit:git-blame[1]. + This option defaults to false. + +blame.date:: + Specifies the format used to output dates in linkgit:git-blame[1]. + If unset the iso format is used. For supported values, + see the discussion of the `--date` option at linkgit:git-log[1]. + branch.autoSetupMerge:: Tells 'git branch' and 'git checkout' to set up new branches so that linkgit:git-pull[1] will appropriately merge from the @@ -2621,6 +2641,35 @@ push.gpgSign:: override a value from a lower-priority config file. An explicit command-line flag always overrides this config option. +push.pushOption:: + When no `--push-option=<option>` argument is given from the + command line, `git push` behaves as if each <value> of + this variable is given as `--push-option=<value>`. ++ +This is a multi-valued variable, and an empty value can be used in a +higher priority configuration file (e.g. `.git/config` in a +repository) to clear the values inherited from a lower priority +configuration files (e.g. `$HOME/.gitconfig`). ++ +-- + +Example: + +/etc/gitconfig + push.pushoption = a + push.pushoption = b + +~/.gitconfig + push.pushoption = c + +repo/.git/config + push.pushoption = + push.pushoption = b + +This will result in only b (a and c are cleared). + +-- + push.recurseSubmodules:: Make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If the value is 'check' |