Re: [RFC/PATCH] Add git-unresolve <paths>...

From: Junio C Hamano <junkio@cox.net>
Date: Apr 20, 2006, 00:33 UTC
Message-ID: <7vacah3x35.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <87r73t2jd3.wl%cworth@cworth.org>

Carl Worth <cworth@cworth.org> writes:

> Thanks for the careful explanation.

You're welcome. You owe me a patch that typo-fixes and pretty-prints my message, and drop it somewhere in Documentation/howto hierarchy for future reference ;-).

> So there's the final piece I'd like here. I think "git status -a -v"
> should provide a multi-parent diff when merging, as should "git status
> -v" after manually doing an update-index while merging.

I'll keep that in mind, but honestly I am not very interested in that particular use case, if only because you can already do that by committing, and running "git show".

If you do not like how the resulting merge commit looks like, we have "git commit --amend" and "git reset --hard HEAD^" for you already.

I (or Linus) _may_ end up doing "git diff tree1 tree2 tree3..." as part of the planned diff rewrite, but that would be only if/when doing things in such a generic way is not much more trouble than the current "we only do one of index-vs-files, tree-vs-index, tree-vs-files-via-index or tree-vs-tree and nothing else" model.