diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:27:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:27:04 (GMT) |
| commit | 72ecc6ef53cb2906f5efab11fa6ab26c1729f233 (patch) | |
| tree | 3de468d4246144d09a85c65abcce0aa5140cb42e /Documentation | |
| parent | 6bcaff1a4fe4a3088348e706c149941c74d1ad61 (diff) | |
| parent | 4d7a5ceacc97e69c4ab5e1543f61fafafb963a9c (diff) | |
| download | git-72ecc6ef53cb2906f5efab11fa6ab26c1729f233.zip git-72ecc6ef53cb2906f5efab11fa6ab26c1729f233.tar.gz git-72ecc6ef53cb2906f5efab11fa6ab26c1729f233.tar.bz2 | |
Merge branch 'js/push-to-deploy'
"git push" into a repository with a working tree normally refuses
to modify the branch that is checked out. The command learned to
optionally do an equivalent of "git reset --hard" only when there
is no change to the working tree and the index instead, which would
be useful to "deploy" by pushing into a repository.
* js/push-to-deploy:
t5516: more tests for receive.denyCurrentBranch=updateInstead
receive-pack: add another option for receive.denyCurrentBranch
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index b563ea8..ac781a4 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2144,6 +2144,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 |