mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 07:28:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[FeatureRequest] git push --force beta Resolves #185

Browse source
This commit is contained in:
Peter Cottle 2014-11-29 17:34:34 -08:00
parent cb776e1b4e
commit 7fc33541cc
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/js/git/index.js
View file

@ -1062,13 +1062,15 @@ GitEngine.prototype.push = function(options) {
var sourceLocation = this.resolveID(options.source || 'HEAD');
// first check if this is even allowed by checking the sync between
this.checkUpstreamOfSource(
this,
this.origin,
branchOnRemote,
sourceLocation,
intl.str('git-error-origin-push-no-ff')
);
if (!options.force) {
this.checkUpstreamOfSource(
this,
this.origin,
branchOnRemote,
sourceLocation,
intl.str('git-error-origin-push-no-ff')
);
}
var commitsToMake = this.getTargetGraphDifference(
this.origin,