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

color animation

Browse source
This commit is contained in:
Peter Cottle 2013-09-01 12:26:01 -07:00
parent 3ff56c002c
commit 3d40125e75
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -349,6 +349,7 @@ 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);
@ -358,7 +359,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 "' +