| commit | 1404bcbb6b3bdb248d32024430644e55faec91ce | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 26 Nov 2014 22:44:16 +0000 (26 23:44 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Dec 2014 01:15:13 +0000 (30 17:15 -0800) | ||
| tree | d02bc43daffcc76e8fc33aa4f5d13cfafca4a9f4 | treesnapshot (tar.gz zip) |
| parent | 66edfe9ddc29102fa39edd37f9aecccbaca6a013 | commitdiff |
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>
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>
| Documentation/config.txt | diffblobblamehistory | |
| builtin/receive-pack.c | diffblobblamehistory | |
| t/t5516-fetch-push.sh | diffblobblamehistory |