From 647bba9903cf4a757d7ed1f4a28913f759f252ea Mon Sep 17 00:00:00 2001
From: Peter Cottle <petermcottle@gmail.com>
Date: Thu, 25 Oct 2012 09:58:58 -0700
Subject: [PATCH] whoops messed up rebase

---
 src/git.js | 3 +++
 todo.txt   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/git.js b/src/git.js
index 2fee1c02..bb2aaad2 100644
--- a/src/git.js
+++ b/src/git.js
@@ -861,7 +861,10 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation) {
 
     // it's not in the set, so we need to rebase this commit
     toRebaseRough.push(popped);
+    toRebaseRough.sort(this.idSortFunc);
+    toRebaseRough.reverse();
     // keep searching
+    pQueue = pQueue.concat(popped.get('parents'));
   }
 
   return this.rebaseFinish(toRebaseRough, stopSet, targetSource, currentLocation);
diff --git a/todo.txt b/todo.txt
index 59b769c9..d90c6516 100644
--- a/todo.txt
+++ b/todo.txt
@@ -5,10 +5,13 @@ Big things:
 Big Graphic things:
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 - gitVisuals OVERHAUL. Will make the load / save tree easier
+- tree layout improvements for merge commits
 
 Medium things:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 - 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:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~