diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2014-11-26 23:44:16 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-30 17:15:13 -0800 |
| commit | 1404bcbb6b3bdb248d32024430644e55faec91ce (patch) | |
| tree | d02bc43daffcc76e8fc33aa4f5d13cfafca4a9f4 /Documentation/config.txt | |
| parent | 66edfe9ddc29102fa39edd37f9aecccbaca6a013 (diff) | |
| download | git-1404bcbb6b3bdb248d32024430644e55faec91ce.tar.gz git-1404bcbb6b3bdb248d32024430644e55faec91ce.tar.xz | |
receive-pack: add another option for receive.denyCurrentBranch
When synchronizing between working directories, it can be handy to update
the current branch via 'push' rather than 'pull', e.g. when pushing a fix
from inside a VM, or when pushing a fix made on a user's machine (where
the developer is not at liberty to install an ssh daemon let alone know
the user's password).
The common workaround – pushing into a temporary branch and then merging
on the other machine – is no longer necessary with this patch.
The new option is:
'updateInstead':
Update the working tree accordingly, but refuse to do so if there
are any uncommitted changes.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -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 e8dd76d97..6a4c19e77 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2129,6 +2129,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 |