Re: Reset by checkout?

From: Atsushi Nakagawa <atnak@chejz.com>
Date: Jun 7, 2014, 04:55 UTC
Message-ID: <20140607135556.7894.B013761@chejz.com>
In-Reply-To: <20140601132624.821C.B013761@chejz.com>

Atsushi Nakagawa <atnak@chejz.com> wrote:

Show 16 quoted lines

> Kevin Bracey <kevin@bracey.fi> wrote:
> > On 31/05/2014 08:46, Atsushi Nakagawa wrote:
> > >    `git checkout -B <current-branch-name> <tree-ish>`
> > >
> > > This is such an useful notion that I can fathom why there isn't a better,
> > > first-tier, alternative.q
> > ...
> > 
> > I guess in theory using "checkout" allows fancier extra options like
> > "--merge" and "--patch", but I don't think I've ever used those with
> > checkout, let alone this mode, where I really do just want a "reset",
> > with safety checks.
> 
> It does indeed have those fancier options.  However, I just noticed
> there's even a 'reset --merge'!  And like you say, I can't remember ever
> using 'checkout --merge' together with 'checkout -B'.

I'd assumed 'reset --merge' was like 'checkout --merge' and was elated.., but it was something else entirely.

Cheers,

-- 
Atsushi Nakagawa
<atnak@chejz.com>
Changes are made when there is inconvenience.