From: Jakub Narebski Date: Wed, 04 Jun 2008 09:47:52 GMT Subject: Re: User's mailing list? And multiple cherry pick Message-ID: <200806041147.53523.jnareb@gmail.com> In-Reply-To: <18c1e6480806040237m1f85c3f2s98ddb35ee1598ab2@mail.gmail.com> David wrote: [...] > In your example, you still have a TMP "rollback" point if you need to > rewind master in the event that the merge into master goes badly. And you have ORIG_HEAD and reflog (master@{1}, master@{2} etc.) as safety net. Reflog is now enabled by default. Besides unless you run prune in the meantime, even without reflogs you would be able to recover using lost-found / git-fsck output. -- Jakub Narebski Poland