mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-29 17:27:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixedsubtlely in rebase

Browse source
This commit is contained in:
Peter Cottle 2013-01-03 15:05:08 -08:00
parent 1ec80eacf6
commit d6e9b6a962
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/bundle.js
View file

@ -8857,6 +8857,7 @@ var InteractiveRebaseView = ContainedBase.extend({
this.entryObjMap = {}; this.entryObjMap = {};
this.rebaseEntries = new RebaseEntryCollection(); this.rebaseEntries = new RebaseEntryCollection();
options.toRebase.reverse();
_.each(options.toRebase, function(commit) { _.each(options.toRebase, function(commit) {
var id = commit.get('id'); var id = commit.get('id');
this.rebaseMap[id] = commit; this.rebaseMap[id] = commit;
@ -8895,7 +8896,6 @@ var InteractiveRebaseView = ContainedBase.extend({
} }
}, this); }, this);
toRebase.reverse();
this.deferred.resolve(toRebase); this.deferred.resolve(toRebase);
// garbage collection will get us // garbage collection will get us
this.$el.html(''); this.$el.html('');
@ -19130,6 +19130,7 @@ var InteractiveRebaseView = ContainedBase.extend({
this.entryObjMap = {}; this.entryObjMap = {};
this.rebaseEntries = new RebaseEntryCollection(); this.rebaseEntries = new RebaseEntryCollection();
options.toRebase.reverse();
_.each(options.toRebase, function(commit) { _.each(options.toRebase, function(commit) {
var id = commit.get('id'); var id = commit.get('id');
this.rebaseMap[id] = commit; this.rebaseMap[id] = commit;
@ -19168,7 +19169,6 @@ var InteractiveRebaseView = ContainedBase.extend({
} }
}, this); }, this);
toRebase.reverse();
this.deferred.resolve(toRebase); this.deferred.resolve(toRebase);
// garbage collection will get us // garbage collection will get us
this.$el.html(''); this.$el.html('');

2
src/js/views/rebaseView.js
View file

@ -19,6 +19,7 @@ var InteractiveRebaseView = ContainedBase.extend({
this.entryObjMap = {}; this.entryObjMap = {};
this.rebaseEntries = new RebaseEntryCollection(); this.rebaseEntries = new RebaseEntryCollection();
options.toRebase.reverse();
_.each(options.toRebase, function(commit) { _.each(options.toRebase, function(commit) {
var id = commit.get('id'); var id = commit.get('id');
this.rebaseMap[id] = commit; this.rebaseMap[id] = commit;
@ -57,7 +58,6 @@ var InteractiveRebaseView = ContainedBase.extend({
} }
}, this); }, this);
toRebase.reverse();
this.deferred.resolve(toRebase); this.deferred.resolve(toRebase);
// garbage collection will get us // garbage collection will get us
this.$el.html(''); this.$el.html('');