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

ALL GIT STUFF DONE YES

Browse source
This commit is contained in:
Peter Cottle 2013-03-02 13:27:27 -08:00
parent 9b4de12074
commit 108ab07f93
3 changed files with 87 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -514,7 +514,7 @@ GitEngine.prototype.revert = function(whichCommits) {
GitEngine.prototype.resetStarter = function() {
if (this.commandOptions['--soft']) {
throw new GitError({
msg: intl.str('git-error-soft')
msg: intl.str('git-error-staging')
});
}
if (this.commandOptions['--hard']) {
@ -1469,16 +1469,16 @@ GitEngine.prototype.show = function(ref) {
GitEngine.prototype.statusStarter = function() {
var lines = [];
if (this.getDetachedHead()) {
lines.push('Detached Head!');
lines.push(intl.str('git-status-detached'));
} else {
var branchName = this.HEAD.get('target').get('id');
lines.push('On branch ' + branchName);
lines.push(intl.str('git-stauts-onbranch', {branch: branchName}));
}
lines.push('Changes to be committed:');
lines.push('');
lines.push('    modified: cal/OskiCostume.stl');
lines.push('');
lines.push('Ready to commit! (as always in this demo)');
lines.push(intl.str('git-status-readytocommit'));
var msg = '';
_.each(lines, function(line) {
@ -1497,7 +1497,7 @@ GitEngine.prototype.logStarter = function() {
this.logWithout(this.generalArgs[0], this.generalArgs[1]);
} else {
throw new GitError({
msg: 'I need a not branch (^branchName) when getting two arguments!'
msg: intl.str('git-error-options')
});
}
}
@ -1551,8 +1551,7 @@ GitEngine.prototype.log = function(ref, omitSet) {
GitEngine.prototype.addStarter = function() {
throw new CommandResult({
msg: "This demo is meant to demonstrate git branching, so don't worry about " +
"adding / staging files. Just go ahead and commit away!"
msg: intl.str('git-error-staging')
});
};
@ -1701,7 +1700,7 @@ var Commit = Backbone.Model.extend({
this.set('createTime', new Date().toString());
}
if (!this.get('commitMessage')) {
this.set('commitMessage', 'Quick Commit. Go Bears!');
this.set('commitMessage', intl.str('git-dummy-msg'));
}
this.set('children', []);