Atsushi Nakagawa <at...@chejz.com> wrote: > Kevin Bracey <ke...@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 <at...@chejz.com> Changes are made when there is inconvenience. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html