The ActionMailer in Rails 2 depends on a buggy version of TMail, which sometimes inserts a blank line into the...
When committing, you should always check the diff of your changes so you don't include any leftovers or irrelevant/bad...
I recently worked on a project with 60+ old feature branches. Most of them had been merged into master and...
In a nutshell: Use git rebase --onto target-branch source-commit target-branch means "branch you want to be based...
On case-insensitive file systems like Mac's HFS+ (per default – you may change this, but it won't work...
Last week saw a security issue with rails 2.3 that required a fix. While an official patch was provided, the...
Quick introduction to git internals for people who are not scared by words like Directed Acyclic Graph. The linked page...
I got these warnings while deploying a Rails 3.2 app with asset pipeline enabled: *** [err :: host.tld] find: `/opt/www/hollyapp.com/releases/20120503115342/public/images': No such...
In your ~/.gitconfig: [core] editor=nano
You can change which branches will be pushed when saying git push. Our recommendation is to set it to current...
When you create a new branch and push it to origin, you won't be tracking it. This means a...
When branches get deleted on origin, your local repository won't take notice of that. You'll still have your...
Instead of showing you two lines for each change, Git allows you to highlight changes in a line explicitly:
If your project manager wants to do gatekeeping on a project, as a developer you need to follow the following...
If you're responsible for gatekeeping in a projects, here is a guide, what to do. In order to reduce...
When deploying code with Capistrano (depending on your configuration) at some point Capistrano tries to check out code from your...
To access files from another branch or past commit without doing a complete checkout, you can either use
If your git index for some reason becomes invalid, no need to worry. Your index is corrupt when you see...
If you want to move a complete commit from one repository to another (and you don't want to add...
Saying git diff only shows unstaged changes relative to the index (or HEAD if the index is empty, alternatively any...
Let's say you have commits that change a file (and looking at the commit details show you the changes...
Removing features and merging those changes back can be painful. Here is how it worked for me.\
Our gitpt script to generate git commits from Pivotal Tracker stories has been tweaked and polished and is now part...
Git has a built-in repository viewer for your web browser. a bit similar (but less awesome) than github.