Category Archives: git

A few tips on git reset

Posted on March 5, 2012 by

I’ve learned a couple of handy tricks with git reset during the last few weeks (mostly by following Github employees on Twitter!). This first tip is really handy when you have messed up your master branch by forgetting to create … Continue reading →

Posted in git | Tagged | Leave a comment

Git for Windows tip: How to copy and paste into Bash

Posted on July 23, 2011 by

Per default the only way to copy and paste into the Git Bash is to click on the git icon in the top left corner and select Edit->Mark/Copy/Paste. This is actually not a property of Git Bash. It is just … Continue reading →

Posted in git | Tagged , , , | Leave a comment

Git for Windows tip: Setting $HOME and the startup directory

Posted on July 11, 2011 by

Git for Windows opens bash in the the user profile directory per default and I wanted to change it to the directory with my Github projects instead. I had to try a couple of approaches before finding the solution. Setting … Continue reading →

Posted in git | Tagged , , , | 1 Comment

Git for Windows tip: Use P4Merge as mergetool

Posted on June 19, 2011 by

I recently found P4Merge (thank you Twitter and Git Immersion) and instantly dropped WinMerge as my standard diff/merge tool. I really like the way it visualises the differences and the 3-way merge is really nicely done. P4Merge is the merge … Continue reading →

Posted in git | Tagged , , , , | Leave a comment

Git for Windows tip: setting an editor

Posted on June 12, 2011 by

The first time I tried to do git commit on msysgit with no commit message (no –m switch), it opened up Vim so that I could write my commit message. Luckily for me I’d read enough Vim jokes on Twitter … Continue reading →

Posted in git | Tagged , , , | Leave a comment

Git for Windows tip: Setting shell aliases with msysgit

Posted on June 10, 2011 by

As msysgit uses a bash shell, you can set really handy aliases for the different git commands. For example gs instead of git status and ga instead of git add are the ones I use the most. Check out the … Continue reading →

Posted in git | Tagged , , | Leave a comment