On Thu, Mar 10, 2011 at 06:15:23PM +0100, Thomas Rast wrote:
> * Clean up add -p
>
> git-add--interactive.perl became a bit of a mess. Partly due to my
> own efforts with {checkout,stash,...} it has bolted-on interfaces to
> other commands. There are some UI issues that simply fall out of
> its design, e.g., you cannot go back from one file to another,
> Ctrl-C stops applying to the current file but does not discard
> earlier files, etc. And that's not saying anything about 'add -i'
> which I don't really know.
>
> This would probably not be a very fun project, but it could add a
> little edge of usability to the tool and it's probably one of the
> few pure-Perl ideas we can offer.
One more wishlist item for this. I use "add -p" for almost all of my
adds these days, because I like the final review check. So after a
conflicted merge, I find myself doing "add -p" to stage my resolution.
The current behavior is that it shows the --cc diff and exits. It would
be cool to handle staging the resolution, which would involve converting
the combined diff into something that can be applied.
> I'd be interested to hear how that goes, because I think the tools are
> fundamentally different. The rebase and thus sequencer family is
> delta-based, and the fast-import and filter-branch families are
> tree-based. Feel free to prove me wrong of course.
Hmm, yeah, that is a fundamental difference. It might be possible to
overcome it, but I admit I haven't really given it any thought yet at
this point.
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html