mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-26 07:58:34 +02:00
refreshing prod since glone si broken there
This commit is contained in:
parent
3d40125e75
commit
6291baf665
7 changed files with 27 additions and 4 deletions
|
@ -7578,7 +7578,7 @@ GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch)
|
||||||
remoteBranch.addLocalBranchThatTracksThis(localBranch);
|
remoteBranch.addLocalBranchThatTracksThis(localBranch);
|
||||||
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
|
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
|
||||||
|
|
||||||
// same for local
|
// same for local TODO intl
|
||||||
var msg = 'local branch "' +
|
var msg = 'local branch "' +
|
||||||
localBranch.get('id') +
|
localBranch.get('id') +
|
||||||
'" set to track remote branch "' +
|
'" 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
|
// this is a little utility class to help arg validation that happens over and over again
|
||||||
validateArgBounds: function(args, lower, upper, option) {
|
validateArgBounds: function(args, lower, upper, option) {
|
||||||
var what = (option === undefined) ?
|
var what = (option === undefined) ?
|
||||||
|
@ -26028,7 +26035,7 @@ GitEngine.prototype.setLocalToTrackRemote = function(localBranch, remoteBranch)
|
||||||
remoteBranch.addLocalBranchThatTracksThis(localBranch);
|
remoteBranch.addLocalBranchThatTracksThis(localBranch);
|
||||||
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
|
localBranch.setRemoteTrackingBranchID(remoteBranch.get('id'));
|
||||||
|
|
||||||
// same for local
|
// same for local TODO intl
|
||||||
var msg = 'local branch "' +
|
var msg = 'local branch "' +
|
||||||
localBranch.get('id') +
|
localBranch.get('id') +
|
||||||
'" set to track remote branch "' +
|
'" 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
|
// this is a little utility class to help arg validation that happens over and over again
|
||||||
validateArgBounds: function(args, lower, upper, option) {
|
validateArgBounds: function(args, lower, upper, option) {
|
||||||
var what = (option === undefined) ?
|
var what = (option === undefined) ?
|
||||||
|
|
1
build/bundle.min.3bbe8ceb.js
Normal file
1
build/bundle.min.3bbe8ceb.js
Normal file
File diff suppressed because one or more lines are too long
1
build/bundle.min.js
vendored
Normal file
1
build/bundle.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -445,7 +445,7 @@
|
||||||
For a much easier time perusing the source, see the individual files at:
|
For a much easier time perusing the source, see the individual files at:
|
||||||
https://github.com/pcottle/learnGitBranching
|
https://github.com/pcottle/learnGitBranching
|
||||||
-->
|
-->
|
||||||
<script src="build/bundle.js"></script>
|
<script src="build/bundle.min.3bbe8ceb.js"></script>
|
||||||
|
|
||||||
<!-- The advantage of github pages: super-easy, simple, slick static hostic.
|
<!-- The advantage of github pages: super-easy, simple, slick static hostic.
|
||||||
The downside? No raw logs to parse for analytics, so I have to include
|
The downside? No raw logs to parse for analytics, so I have to include
|
||||||
|
|
|
@ -349,7 +349,6 @@ GitEngine.prototype.makeOrigin = function(treeString) {
|
||||||
ORIGIN_PREFIX + branchName,
|
ORIGIN_PREFIX + branchName,
|
||||||
this.getCommitFromRef(originTarget)
|
this.getCommitFromRef(originTarget)
|
||||||
);
|
);
|
||||||
debugger;
|
|
||||||
|
|
||||||
this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch);
|
this.setLocalToTrackRemote(this.refs[branchJSON.id], originBranch);
|
||||||
}, this);
|
}, this);
|
||||||
|
|
|
@ -133,6 +133,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
|
// this is a little utility class to help arg validation that happens over and over again
|
||||||
validateArgBounds: function(args, lower, upper, option) {
|
validateArgBounds: function(args, lower, upper, option) {
|
||||||
var what = (option === undefined) ?
|
var what = (option === undefined) ?
|
||||||
|
|
1
todo.txt
1
todo.txt
|
@ -11,6 +11,7 @@ Medium things:
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
[ ] figure out what to do with instant commands (and parse waterfall and the like)
|
[ ] figure out what to do with instant commands (and parse waterfall and the like)
|
||||||
[ ] disable git commands on hg levels
|
[ ] disable git commands on hg levels
|
||||||
|
[ ] EASY -- make colors the same between remote branches and their remote counterparts
|
||||||
|
|
||||||
Cases to handle / things to edit
|
Cases to handle / things to edit
|
||||||
=======================
|
=======================
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue