From d713e2d87a5003da02d95a4ac5be28a1e9fdc3ce Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Sat, 30 May 2009 04:11:43 -0400 Subject: Make --squash work with the 'add' command too. --- todo | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'todo') diff --git a/todo b/todo index f23a6d4ff2..a15a378da5 100644 --- a/todo +++ b/todo @@ -10,11 +10,14 @@ "-s subtree" should be given an explicit subtree option? There doesn't seem to be a way to do this. We'd have to patch git-merge-subtree. Ugh. + (but we could avoid this problem by generating squashes with + exactly the right subtree structure, rather than using + subtree merge...) add a 'push' subcommand to parallel 'pull' add a 'log' subcommand to see what's new in a subtree? - add a --squash option so we don't merge histories but can still split - add to-submodule and from-submodule commands + + automated tests for --squash stuff -- cgit v1.2.3