From: Junio C Hamano <junkio@cox.net>
Date: Fri, 9 Sep 2005 02:12:30 +0000 (-0700)
Subject: Updates 2005-09-08 evening.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=7bd5db67c1e3c95a4b15117b030e3dae05fb5148;p=git.git

Updates 2005-09-08 evening.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/TODO b/TODO
index 21e26859..cd6c5b8e 100644
--- a/TODO
+++ b/TODO
@@ -180,6 +180,11 @@ Technical (milder)
 
 * Option to limit rename detection for more than N paths.
 
+* Make rebase restartable; instead of skipping what cannot be
+  automatically forward ported, leave the conflicts in the work
+  tree, have the user resolve it, and then restart from where it
+  left off.
+
 
 Technical (trivial)
 -------------------