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

refreshing prod since glone si broken there

Browse source
This commit is contained in:
Peter Cottle 2013-09-09 11:42:57 -07:00
parent 3d40125e75
commit 6291baf665
7 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
build/bundle.js
View file

@ -7578,7 +7578,7 @@ GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch)
remoteBranch.addLocalBranchThatTracksThis(localBranch);
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
// same for local
// same for local TODO intl
var msg = 'local branch "' +
localBranch.get('id') +
'" set to track remote branch "' +
@ -14996,6 +14996,13 @@ var Command = Backbone.Model.extend({
}
},
twoArgsImpliedOrigin: function(args) {
this.validateArgBounds(args, 0, 2);
if (args.length < 2) {
args.unshift('origin');
}
},
// this is a little utility class to help arg validation that happens over and over again
validateArgBounds: function(args, lower, upper, option) {
var what = (option === undefined) ?
@ -26028,7 +26035,7 @@ GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch)
remoteBranch.addLocalBranchThatTracksThis(localBranch);
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
// same for local
// same for local TODO intl
var msg = 'local branch "' +
localBranch.get('id') +
'" set to track remote branch "' +
@ -31101,6 +31108,13 @@ var Command = Backbone.Model.extend({
}
},
twoArgsImpliedOrigin: function(args) {
this.validateArgBounds(args, 0, 2);
if (args.length < 2) {
args.unshift('origin');
}
},
// this is a little utility class to help arg validation that happens over and over again
validateArgBounds: function(args, lower, upper, option) {
var what = (option === undefined) ?