Category Archives: git

Git core.autocrlf settings poll results

Posted on March 8, 2012 by Jimmy Bogard

The results from last week’s poll are in! And they couldn’t be more (less) clear: A highly unscientific poll shows an even split between true and false, with a minority choosing the other two options. So that settles it! What’s … Continue reading →

| 4 Comments

Twtpoll – your git global core.autocrlf settings

Posted on March 2, 2012 by Jimmy Bogard

I’m curious to see what folks set as their default core.autocrlf settings in git (for those of us who use msysgit on Windows): http://twtpoll.com/tts3oj I have a feeling that we need a sensible default, but have seen lots of opinions … Continue reading →

| 3 Comments

Improving the Git Windows experience: Downloads

Posted on February 1, 2012 by Jimmy Bogard

I love Git. It’s very powerful tool that lets me bend my repository to my will, with commands and features that blow the other source control providers I’ve used out of the water. However, the tooling just doesn’t do it … Continue reading →

| 30 Comments

Cleaning Out Git Remotes The Easy Way

Posted on January 31, 2012 by Derick Bailey

I had a rather large number of remote repositories set up in my Backbone.ModelBinding repository on my box, due to the wonderful community of contributors. But it was time for me to clean out the remotes as I no longer … Continue reading →

| 6 Comments

posh-git on Herding Code

Posted on January 29, 2012 by Keith Dahlby

Earlier this month I had the opportunity to record an episode of Herding Code with GitHubbers Paul Betts and Phil Haack on the state of Git for Windows: Herding Code 132. Topics included discussions on why Git hates developers and … Continue reading →

Also posted in Blogs | 1 Comment

Automating Docco Generation And Deployment To Heroku And Github

Posted on December 26, 2011 by Derick Bailey

I got tired of manually typing “git push origin master” and “git push heroku master” to push changes in my BBCloneMail app up to Github and then deploy to Heroku. So I automated that with a rake task. Then I … Continue reading →

| Comments Off

Git Beyond the D in DVCS

Posted on October 14, 2011 by Keith Dahlby

Jimmy’s post is a nice reminder of the advantages of a distributed version control system. But having ramped up on Git primarily through git-svn, I thought it would be worth enumerating some of the advantages I’ve found just in my … Continue reading →

Also posted in Linux, Misc | Comments Off

The D in DVCS

Posted on October 14, 2011 by Jimmy Bogard

Just a reminder that the D in DVCS stands for “Distributed”, not “Disconnected” or “Decentralized”. This is a centralized model (from http://progit.org/book): And this is Distributed: Note that in the first picture, you’re reliant and dependent on the server for … Continue reading →

| 6 Comments

Git workflows with git-tfs

Posted on September 20, 2011 by Jimmy Bogard

I’ve been working with git-tfs on a project for about a couple of months. Git-tfs is a source control bridge that allows you to work with Git locally, reducing the number of operations to communicate with the TFS source control … Continue reading →

| 51 Comments

How to fix Subversion merge

Posted on July 28, 2011 by Jimmy Bogard

Having done quite a bit of branching in centralized and distributed source control systems, I’m intimately aware of the additional (and I would say, unnecessary) pain centralized source control systems like Subversion and TFS bring to more powerful branching strategies … Continue reading →

| Comments Off