From: Christian Couder Date: Thu, 17 Sep 2009 12:12:50 GMT Subject: Re: [PATCH v3 3/4] reset: add option "--merge-safe" to "git reset" Message-ID: In-Reply-To: <4AB1E41F.6050304@viscovery.net> On Thu, Sep 17, 2009 at 9:24 AM, Johannes Sixt wrote: > Junio C Hamano schrieb: >> Johannes Sixt writes: >>> Junio C Hamano schrieb: >>> (2) The intended use-case of --merge-safe is to point the branch head to a >>> different commit, but to carry the changes that currently are in the index >>> and wd over to the new commit, similar to checkout --merge. > > This is actually an operation that I need quite often, but I can do it > only by way of git stash. > > Clarification: I did not say that I actually meant to carry *only* the > index and wd changes to the new commit. That is, the operation I have in > mind can roughly be done in terms of > >  $ git stash >  $ git reset --hard $target >  $ git stash pop > >> I have _no_ idea what the intended use-case of --merge-safe is, and that >> was why I asked Christian for clarification in the previous round.  The >> answer was still not clear enough so I pointed out --merge-safe could be >> still doing a wrong thing even in _his_ use-case. > > Reading Christian in 200909170554.49416.chriscool@tuxfamily.org, I think > this *is* his use-case? Christian? Yes, I agree, it can be used instead of git stash. By the way Linus, in his patch that added the --merge option, said that --merge could be used like that. So for this use case --merge-safe is safer than --merge, and that's why I suggested that name. But I know I suck at naming things, so there is probably a better name. Thanks, Christian.