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

whoops messed up rebase

Browse source
This commit is contained in:
Peter Cottle 2012-10-25 09:58:58 -07:00
parent a1b1b0b31b
commit 647bba9903
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/git.js
View file

@ -861,7 +861,10 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation) {
// it's not in the set, so we need to rebase this commit // it's not in the set, so we need to rebase this commit
toRebaseRough.push(popped); toRebaseRough.push(popped);
toRebaseRough.sort(this.idSortFunc);
toRebaseRough.reverse();
// keep searching // keep searching
pQueue = pQueue.concat(popped.get('parents'));
} }
return this.rebaseFinish(toRebaseRough, stopSet, targetSource, currentLocation); return this.rebaseFinish(toRebaseRough, stopSet, targetSource, currentLocation);

3
todo.txt
View file

@ -5,10 +5,13 @@ Big things:
Big Graphic things: Big Graphic things:
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
- gitVisuals OVERHAUL. Will make the load / save tree easier - gitVisuals OVERHAUL. Will make the load / save tree easier
- tree layout improvements for merge commits
Medium things: Medium things:
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
- gitEngine loads from tree immediately, not the weird thing we have now! - gitEngine loads from tree immediately, not the weird thing we have now!
- tree load both gitEngine and gitVisuals
- better merge birth animation
Small things to implement: Small things to implement:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~