Best practices for merging?

[Brandon Allbery]

On Tue, Feb 2, 2016 at 9:55 AM, Richard Eisenberg <eir at cis.upenn.edu> wrote:

> What if there were an official place to keep dirty histories?


git actually has a place for these, although at a price: when you squash
commits or otherwise modify history, the originals are retained in the
reflog. By default the reflog gets cleaned periodically, and letting it
grow without bound has a performance impact, but in theory it could be used
to keep this information.

-- 
brandon s allbery kf8nh                               sine nomine associates
allbery.b at gmail.com                                  ballbery at sinenomine.net
unix, openafs, kerberos, infrastructure, xmonad        http://sinenomine.net
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-devs/attachments/20160202/617cc3ba/attachment.html>