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

[Origin] git pull done wow that was easy

Browse source
This commit is contained in:
Peter Cottle 2013-05-27 10:56:35 -07:00
parent a24f62420d
commit 29415cb525
7 changed files with 76 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -799,7 +799,19 @@ GitEngine.prototype.fetch = function() {
this.animationFactory.refreshTree(this.animationQueue, this.gitVisuals);
};
GitEngine.prototype.originInitStarter = function() {
GitEngine.prototype.pullStarter = function() {
this.acceptNoGeneralArgs();
// no matter what fetch
this.fetch();
// then either rebase or merge
if (this.commandOptions['--rebase']) {
this.rebaseFinisher('o/master', 'master');
} else {
this.merge('o/master');
}
};
GitEngine.prototype.cloneStarter = function() {
this.acceptNoGeneralArgs();
this.makeOrigin(this.printTree(this.exportTreeForBranch('master')));
};
@ -1195,16 +1207,17 @@ GitEngine.prototype.rebaseStarter = function() {
}
this.twoArgsImpliedHead(this.generalArgs);
this.rebaseFinisher(this.generalArgs[0], this.generalArgs[1]);
};
var response = this.rebase(this.generalArgs[0], this.generalArgs[1]);
GitEngine.prototype.rebaseFinisher = function(targetSource, currentLocation) {
var response = this.rebase(targetSource, currentLocation);
if (response === undefined) {
// was a fastforward or already up to date. returning now
// will trigger the refresh animation by not adding anything to
// the animation queue
return;
}
this.animationFactory.rebaseAnimation(this.animationQueue, response, this, this.gitVisuals);
};