On Sat, 2009-11-14 at 05:01 -0600, Jonathan Nieder wrote:
Stephen Boyd wrote:
quoted
I see a small problem, but it can be fixed in another patch. git
merge -s <TAB><TAB> the first time when you're not in a git
directory will make git merge -s <TAB><TAB> after never complete
correctly even in a git directory.
Not good. I think the sanest thing to do is avoid caching the merge
strategy list entirely. Listing merge strategies takes about 100 ms
here, which is short enough not to be annoying.
I was thinking of adding an option to git merge (like --strategies) to
list the strategies without requiring you to be in a git directory. It
doesn't look that easy at first glance so it might not be worth the
trouble.