diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 14:48:09 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 14:48:09 -0800 |
commit | 6df93d9e8038d7ac3d2cb49dfbe125e874b15ba9 (patch) | |
tree | 61e19c43f6d3ff81843003c365713c7213fb26f1 /config.txt | |
parent | 30758bdbd92da4a8a57a943699d50e65f12646a0 (diff) | |
download | git-htmldocs-6df93d9e8038d7ac3d2cb49dfbe125e874b15ba9.tar.gz |
Autogenerated HTML docs for v2.2.1-201-gbbceff
Diffstat (limited to 'config.txt')
-rw-r--r-- | config.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/config.txt b/config.txt index 9335ff2ae..6862e3e30 100644 --- a/config.txt +++ b/config.txt @@ -849,11 +849,13 @@ accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`, `blink` and `reverse`. The first color given is the foreground; the second is the background. The position of the attribute, if any, -doesn't matter. +doesn't matter. Attributes may be turned off specifically by prefixing +them with `no` (e.g., `noreverse`, `noul`, etc). + Colors (foreground and background) may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all -terminals may support this). +terminals may support this). If your terminal supports it, you may also +specify 24-bit RGB values as hex, like `#ff0ab3`. color.diff:: Whether to use ANSI escape sequences to add color to patches. @@ -2144,6 +2146,13 @@ receive.denyCurrentBranch:: print a warning of such a push to stderr, but allow the push to proceed. If set to false or "ignore", allow such pushes with no message. Defaults to "refuse". ++ +Another option is "updateInstead" which will update the working +directory (must be clean) if pushing into the current branch. This option is +intended for synchronizing working directories when one side is not easily +accessible via interactive ssh (e.g. a live web site, hence the requirement +that the working directory be clean). This mode also comes in handy when +developing inside a VM to test and fix code on different Operating Systems. receive.denyNonFastForwards:: If set to true, git-receive-pack will deny a ref update which is @@ -2318,6 +2327,7 @@ sendemail.smtpserverport:: sendemail.smtpserveroption:: sendemail.smtpuser:: sendemail.thread:: +sendemail.transferencoding:: sendemail.validate:: See linkgit:git-send-email[1] for description. |