From: Junio C Hamano Date: Tue, 21 Oct 2014 20:28:47 +0000 (-0700) Subject: Merge branch 'da/mergetool-meld' X-Git-Tag: v2.2.0-rc0~27 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/48f662dd74ed9e909a8ba878152f88a238a97b4f?hp=-c Merge branch 'da/mergetool-meld' Newer versions of 'meld' breaks the auto-detection we use to see if they are new enough to support the `--output` option. * da/mergetool-meld: mergetools/meld: make usage of `--output` configurable and more robust --- 48f662dd74ed9e909a8ba878152f88a238a97b4f diff --combined Documentation/config.txt index be6cf35c02,382e12c69e..400dcad21d --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -499,8 -499,7 +499,8 @@@ core.bigFileThreshold: Files larger than this size are stored deflated, without attempting delta compression. Storing large files without delta compression avoids excessive memory usage, at the - slight expense of increased disk usage. + slight expense of increased disk usage. Additionally files + larger than this size are always treated as binary. + Default is 512 MiB on all platforms. This should be reasonable for most projects as source code and other text files can still @@@ -1755,6 -1754,15 +1755,15 @@@ mergetool..trustExitCode: if the file has been updated, otherwise the user is prompted to indicate the success of the merge. + mergetool.meld.hasOutput:: + Older versions of `meld` do not support the `--output` option. + Git will attempt to detect whether `meld` supports `--output` + by inspecting the output of `meld --help`. Configuring + `mergetool.meld.hasOutput` will make Git skip these checks and + use the configured value instead. Setting `mergetool.meld.hasOutput` + to `true` tells Git to unconditionally use the `--output` option, + and `false` avoids using `--output`. + mergetool.keepBackup:: After performing a merge, the original file with conflict markers can be saved as a file with a `.orig` extension. If this variable @@@ -1768,12 -1776,6 +1777,12 @@@ mergetool.keepTemporaries: preserved, otherwise they will be removed after the tool has exited. Defaults to `false`. +mergetool.writeToTemp:: + Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of + conflicting files in the worktree by default. Git will attempt + to use a temporary directory for these files when set `true`. + Defaults to `false`. + mergetool.prompt:: Prompt before each invocation of the merge resolution program. @@@ -2050,25 -2052,6 +2059,25 @@@ receive.autogc: receiving data from git-push and updating refs. You can stop it by setting this variable to false. +receive.certnonceseed:: + By setting this variable to a string, `git receive-pack` + will accept a `git push --signed` and verifies it by using + a "nonce" protected by HMAC using this string as a secret + key. + +receive.certnonceslop:: + When a `git push --signed` sent a push certificate with a + "nonce" that was issued by a receive-pack serving the same + repository within this many seconds, export the "nonce" + found in the certificate to `GIT_PUSH_CERT_NONCE` to the + hooks (instead of what the receive-pack asked the sending + side to include). This may allow writing checks in + `pre-receive` and `post-receive` a bit easier. Instead of + checking `GIT_PUSH_CERT_NONCE_SLOP` environment variable + that records by how many seconds the nonce is stale to + decide if they want to accept the certificate, they only + can check `GIT_PUSH_CERT_NONCE_STATUS` is `OK`. + receive.fsckObjects:: If it is set to true, git-receive-pack will check all received objects. It will abort in the case of a malformed object or a