14 Jun '12, 6am

git config rerere.enabled true

There have been times where I performed a rebase and had to resolve conflicts as part of the rebase, and then decided to abort the rebase for one reason or another. Without rerere the next time I went to perform the rebase I'd end up having to resolve at least some of the same conflicts I had previously, which is annoying. This is where rerere comes in. It stands for re use re corded re solution. What rerere does is save the resolution of a conflict so that it can be re-applied later if it sees the same conflict again. When Git sees the conflict which it already has a resolution recorded for, it will apply the resolution automatically for you, and give you the opportunity to accept the resolution as applied, or change it. Turning it on can be done two ways: set it as a configuration parameter using git config rerere.enabled true , or use it only when you think you might ne...

Full article: http://pivotallabs.com/users/khicks/blog/articles/2119-gi...

Tweets

Nike "Be True Pride" Pack

Nike "Be True Pride" Pack

nicekicks.com 15 Jun '12, 8pm

celebrates the diversity and multifaceted culture of New York, San Francisco, and Portland. Utilizing the Lunar Flow , Air...

Nike Be True Pride Pack:

Nike Be True Pride Pack:

lesitedelasneaker.com 18 Jun '12, 9am

célèbre l’accomplissement des communautés LGBT (sigle de « Lesbian, Gay, Bisexual and Transgendered people », soit en fran...

Railscasts - Git on Rails:

railscasts.com 26 Jun '12, 3pm

Git has been getting a lot of buzz lately, and for good reason. It's an excellent SCM which in many ways is more simple an...