mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-27 16:38:50 +02:00
Remove all white space at end of line
This commit is contained in:
parent
58f2dc4156
commit
10bcc0a02f
17 changed files with 870 additions and 870 deletions
File diff suppressed because it is too large
Load diff
|
@ -37,7 +37,7 @@ var commands = {
|
||||||
// copy command, and then set opts
|
// copy command, and then set opts
|
||||||
commandObj.setOptionsMap(delConfig.options || {});
|
commandObj.setOptionsMap(delConfig.options || {});
|
||||||
commandObj.setGeneralArgs(delConfig.args || []);
|
commandObj.setGeneralArgs(delConfig.args || []);
|
||||||
|
|
||||||
commandConfigs[delConfig.vcs][delConfig.name].execute.call(this, engine, commandObj);
|
commandConfigs[delConfig.vcs][delConfig.name].execute.call(this, engine, commandObj);
|
||||||
}, this);
|
}, this);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -107,7 +107,7 @@ exports.getStartDialog = function(level) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
var startCopy = Object.assign(
|
var startCopy = Object.assign(
|
||||||
{},
|
{},
|
||||||
level.startDialog[getDefaultLocale()] || level.startDialog
|
level.startDialog[getDefaultLocale()] || level.startDialog
|
||||||
);
|
);
|
||||||
startCopy.childViews.unshift(errorAlert);
|
startCopy.childViews.unshift(errorAlert);
|
||||||
|
|
|
@ -206,7 +206,7 @@ var commandConfig = {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
backout: {
|
backout: {
|
||||||
regex: /^hg +backout($|\s+)/,
|
regex: /^hg +backout($|\s+)/,
|
||||||
options: [
|
options: [
|
||||||
|
|
|
@ -76,7 +76,7 @@ var Command = Backbone.Model.extend({
|
||||||
mapDotToHead: function() {
|
mapDotToHead: function() {
|
||||||
var generalArgs = this.getGeneralArgs();
|
var generalArgs = this.getGeneralArgs();
|
||||||
var options = this.getOptionsMap();
|
var options = this.getOptionsMap();
|
||||||
|
|
||||||
generalArgs = generalArgs.map(function(arg) {
|
generalArgs = generalArgs.map(function(arg) {
|
||||||
return this.replaceDotWithHead(arg);
|
return this.replaceDotWithHead(arg);
|
||||||
}, this);
|
}, this);
|
||||||
|
|
|
@ -60,7 +60,7 @@ var LevelToolbarView = React.createClass({
|
||||||
<button
|
<button
|
||||||
onClick={this.props.onGoalClick}
|
onClick={this.props.onGoalClick}
|
||||||
type="button">
|
type="button">
|
||||||
{this.state.isGoalExpanded ?
|
{this.state.isGoalExpanded ?
|
||||||
intl.str('hide-goal-button') :
|
intl.str('hide-goal-button') :
|
||||||
intl.str('show-goal-button')
|
intl.str('show-goal-button')
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ var GRAPHICS = {
|
||||||
tagFill: 'hsb(0,0,0.9)',
|
tagFill: 'hsb(0,0,0.9)',
|
||||||
tagStroke: '#FFF',
|
tagStroke: '#FFF',
|
||||||
tagStrokeWidth: '2',
|
tagStrokeWidth: '2',
|
||||||
|
|
||||||
orphanNodeFill: 'hsb(0.5,0.8,0.7)'
|
orphanNodeFill: 'hsb(0.5,0.8,0.7)'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ module.exports = function(func, time) {
|
||||||
if (!wait) {
|
if (!wait) {
|
||||||
func.apply(this, arguments);
|
func.apply(this, arguments);
|
||||||
wait = true;
|
wait = true;
|
||||||
|
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
wait = false;
|
wait = false;
|
||||||
}, time);
|
}, time);
|
||||||
|
|
|
@ -311,7 +311,7 @@ var ModalTerminal = ContainedBase.extend({
|
||||||
|
|
||||||
this.container = new ModalView();
|
this.container = new ModalView();
|
||||||
this.JSON = {
|
this.JSON = {
|
||||||
title: options.title
|
title: options.title
|
||||||
};
|
};
|
||||||
|
|
||||||
this.render();
|
this.render();
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
exports.level = {
|
exports.level = {
|
||||||
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C5\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"side\":{\"target\":\"C3\",\"id\":\"side\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C1\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C2\",\"C4\"],\"id\":\"C5\"}},\"tags\":{\"v1\":{\"target\":\"C2\",\"id\":\"v1\",\"type\":\"tag\"},\"v0\":{\"target\":\"C1\",\"id\":\"v0\",\"type\":\"tag\"}},\"HEAD\":{\"target\":\"C2\",\"id\":\"HEAD\"}}",
|
"goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C5\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"side\":{\"target\":\"C3\",\"id\":\"side\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C1\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C2\",\"C4\"],\"id\":\"C5\"}},\"tags\":{\"v1\":{\"target\":\"C2\",\"id\":\"v1\",\"type\":\"tag\"},\"v0\":{\"target\":\"C1\",\"id\":\"v0\",\"type\":\"tag\"}},\"HEAD\":{\"target\":\"C2\",\"id\":\"HEAD\"}}",
|
||||||
"solutionCommand": "git tag v1 side~1;git tag v0 master~2;git checkout v1",
|
"solutionCommand": "git tag v1 side~1;git tag v0 master~2;git checkout v1",
|
||||||
"startTree": "{\"branches\":{\"master\":{\"target\":\"C5\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"side\":{\"target\":\"C3\",\"id\":\"side\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C1\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C2\",\"C4\"],\"id\":\"C5\"}},\"tags\":{},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",
|
"startTree": "{\"branches\":{\"master\":{\"target\":\"C5\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"side\":{\"target\":\"C3\",\"id\":\"side\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C1\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C2\",\"C4\"],\"id\":\"C5\"}},\"tags\":{},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
exports.level = {
|
exports.level = {
|
||||||
"goalTreeString": "%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22master%22%7D%2C%22bugFix%22%3A%7B%22target%22%3A%22C3%22%2C%22id%22%3A%22bugFix%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C5%22%2C%22id%22%3A%22side%22%7D%2C%22another%22%3A%7B%22target%22%3A%22C7%22%2C%22id%22%3A%22another%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C6%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C4%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",
|
"goalTreeString": "%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22master%22%7D%2C%22bugFix%22%3A%7B%22target%22%3A%22C3%22%2C%22id%22%3A%22bugFix%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C5%22%2C%22id%22%3A%22side%22%7D%2C%22another%22%3A%7B%22target%22%3A%22C7%22%2C%22id%22%3A%22another%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C6%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C4%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",
|
||||||
"solutionCommand": "git cherry-pick C3 C4 C7",
|
"solutionCommand": "git cherry-pick C3 C4 C7",
|
||||||
"compareOnlyMasterHashAgnostic": true,
|
"compareOnlyMasterHashAgnostic": true,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
exports.level = {
|
exports.level = {
|
||||||
"goalTreeString": "%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C4%27%22%2C%22id%22%3A%22master%22%7D%2C%22overHere%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22overHere%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C5%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C5%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C5%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",
|
"goalTreeString": "%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C4%27%22%2C%22id%22%3A%22master%22%7D%2C%22overHere%22%3A%7B%22target%22%3A%22C1%22%2C%22id%22%3A%22overHere%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C3%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C5%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C5%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C5%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",
|
||||||
"solutionCommand": "git rebase -i overHere --solution-ordering C3,C5,C4",
|
"solutionCommand": "git rebase -i overHere --solution-ordering C3,C5,C4",
|
||||||
"compareOnlyMasterHashAgnostic": true,
|
"compareOnlyMasterHashAgnostic": true,
|
||||||
|
|
|
@ -574,7 +574,7 @@ exports.level = {
|
||||||
"markdowns": [
|
"markdowns": [
|
||||||
"Poderás preguntarte \"¿Por qué git aplicou eses commits sobre a rama `origin/foo` e non os aplicou sobre a rama `foo` local? Lembra que o parámetro `<lugar>` era un lugar que existía tanto no local como no remoto.\"",
|
"Poderás preguntarte \"¿Por qué git aplicou eses commits sobre a rama `origin/foo` e non os aplicou sobre a rama `foo` local? Lembra que o parámetro `<lugar>` era un lugar que existía tanto no local como no remoto.\"",
|
||||||
"",
|
"",
|
||||||
"Bueno, git fai unha excepción especial neste caso, xa que poderías ter traballo na rama `foo` que non quixeras mesturar. Esto refírese á lección anterior sobre `git fetch` - non actualiza as túas ramas locais non-remotas, só descarga os commits (para que poidas velos ou mesturalos despois).",
|
"Bueno, git fai unha excepción especial neste caso, xa que poderías ter traballo na rama `foo` que non quixeras mesturar. Esto refírese á lección anterior sobre `git fetch` - non actualiza as túas ramas locais non-remotas, só descarga os commits (para que poidas velos ou mesturalos despois).",
|
||||||
""
|
""
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -363,7 +363,7 @@ exports.level = {
|
||||||
"¿E qué hai se o destino ó que queres empurrar non existise? ¡Non pasa nada! Sinxelamente dalle un nome á rama e git vaise encargar de crealo no remoto."
|
"¿E qué hai se o destino ó que queres empurrar non existise? ¡Non pasa nada! Sinxelamente dalle un nome á rama e git vaise encargar de crealo no remoto."
|
||||||
],
|
],
|
||||||
"afterMarkdowns": [
|
"afterMarkdowns": [
|
||||||
"Xenial, sinxelamente tira para adiante"
|
"Xenial, sinxelamente tira para adiante"
|
||||||
],
|
],
|
||||||
"command": "git push origin master:newBranch",
|
"command": "git push origin master:newBranch",
|
||||||
"beforeCommand": "git clone; git commit"
|
"beforeCommand": "git clone; git commit"
|
||||||
|
|
|
@ -563,7 +563,7 @@ exports.level = {
|
||||||
"type": "GitDemonstrationView",
|
"type": "GitDemonstrationView",
|
||||||
"options": {
|
"options": {
|
||||||
"beforeMarkdowns": [
|
"beforeMarkdowns": [
|
||||||
"Suficiente charla, ¡vexamos unha demo! Imos facer checkout a unha nova rama chamada `foo` e facer que siga a `master` no remoto."
|
"Suficiente charla, ¡vexamos unha demo! Imos facer checkout a unha nova rama chamada `foo` e facer que siga a `master` no remoto."
|
||||||
],
|
],
|
||||||
"afterMarkdowns": [
|
"afterMarkdowns": [
|
||||||
"Como podes ver, empregamos o obxectivo implícito de merge `o/master` para actualizar a rama `foo`. ¡Nota como `master` non foi actualizada!"
|
"Como podes ver, empregamos o obxectivo implícito de merge `o/master` para actualizar a rama `foo`. ¡Nota como `master` non foi actualizada!"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* CSS animated rainbow dividers of awesome
|
* CSS animated rainbow dividers of awesome
|
||||||
* by Chris Heilmann @codepo8 and Lea Verou @leaverou
|
* by Chris Heilmann @codepo8 and Lea Verou @leaverou
|
||||||
**/
|
**/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -8,28 +8,28 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@-moz-keyframes rainbowanim {
|
@-moz-keyframes rainbowanim {
|
||||||
from { background-position:top left; }
|
from { background-position:top left; }
|
||||||
to {background-position:top right; }
|
to {background-position:top right; }
|
||||||
}
|
}
|
||||||
@-webkit-keyframes rainbowanim {
|
@-webkit-keyframes rainbowanim {
|
||||||
from { background-position:top left; }
|
from { background-position:top left; }
|
||||||
to { background-position:top right; }
|
to { background-position:top right; }
|
||||||
}
|
}
|
||||||
@-o-keyframes rainbowanim {
|
@-o-keyframes rainbowanim {
|
||||||
from { background-position:top left; }
|
from { background-position:top left; }
|
||||||
to { background-position:top right; }
|
to { background-position:top right; }
|
||||||
}
|
}
|
||||||
@-ms-keyframes rainbowanim {
|
@-ms-keyframes rainbowanim {
|
||||||
from { background-position:top left; }
|
from { background-position:top left; }
|
||||||
to { background-position:top right; }
|
to { background-position:top right; }
|
||||||
}
|
}
|
||||||
@-khtml-keyframes rainbowanim {
|
@-khtml-keyframes rainbowanim {
|
||||||
from { background-position:top left; }
|
from { background-position:top left; }
|
||||||
to { background-position:top right; }
|
to { background-position:top right; }
|
||||||
}
|
}
|
||||||
@keyframes rainbowanim {
|
@keyframes rainbowanim {
|
||||||
from { background-position:top left; }
|
from { background-position:top left; }
|
||||||
to { background-position:top right; }
|
to { background-position:top right; }
|
||||||
}
|
}
|
||||||
|
|
||||||
.catchadream{
|
.catchadream{
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
|
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
|
||||||
"http://www.w3.org/TR/html4/strict.dtd">
|
"http://www.w3.org/TR/html4/strict.dtd">
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue