diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-17 14:11:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-17 14:11:26 -0800 |
| commit | 6bb32e61faff1d96d84d668f44b4440210b0e23c (patch) | |
| tree | aea24c30b07a7bfb8869945bba6a5d75701cc1c4 /config.txt | |
| parent | 0bcc239ed214940dcb68139f571d91bf04f1a0c9 (diff) | |
| download | git-htmldocs-6bb32e61faff1d96d84d668f44b4440210b0e23c.tar.gz | |
Autogenerated HTML docs for v2.3.0-130-g3188a
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/config.txt b/config.txt index 04e2a7168..ae6791db1 100644 --- a/config.txt +++ b/config.txt @@ -2094,6 +2094,11 @@ rebase.autostash:: successful rebase might result in non-trivial conflicts. Defaults to false. +receive.advertiseatomic:: + By default, git-receive-pack will advertise the atomic push + capability to its clients. If you don't want to this capability + to be advertised, set this variable to false. + receive.autogc:: By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop @@ -2153,11 +2158,15 @@ receive.denyCurrentBranch:: 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 +tree 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. ++ +By default, "updateInstead" will refuse the push if the working tree or +the index have any difference from the HEAD, but the `push-to-checkout` +hook can be used to customize this. See linkgit:githooks[5]. receive.denyNonFastForwards:: If set to true, git-receive-pack will deny a ref update which is |