diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-11 22:43:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-11 22:43:56 +0100 |
| commit | cba07bb6ff58da5aa4538c4a2bbf70b717b172b3 (patch) | |
| tree | 9c81fde7d29150ab4c484a5078d88378f376874f /Documentation/config.txt | |
| parent | Merge branch 'sb/atomic-push' (diff) | |
| parent | receive-pack: support push-to-checkout hook (diff) | |
| download | git-cba07bb6ff58da5aa4538c4a2bbf70b717b172b3.tar.xz git-cba07bb6ff58da5aa4538c4a2bbf70b717b172b3.zip | |
Merge branch 'jc/push-to-checkout'
Extending the js/push-to-deploy topic, the behaviour of "git push"
when updating the working tree and the index with an update to the
branch that is checked out can be tweaked by push-to-checkout hook.
* jc/push-to-checkout:
receive-pack: support push-to-checkout hook
receive-pack: refactor updateInstead codepath
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1a54eae8f8..ae6791db12 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2158,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 |