The ‘merge.*.driver` variable’s value is used to construct a command to run to merge ancestor’s version, current...
Every time you amend, rebase or reset, git commits get "overwritten". However, git still allows you to checkout those commits...
If you modified git's history and the change was already pushed, you will usually get a ! [rejected] my-branch...
To change the commit message of the latest (unpushed, unmerged) commit, you can use git commit --amend
Lets say you need to make a change to a commit OLD_COMMIT, but this is not the most recent...
To change a commit message of the most recent (unpushed) commit, you can simply use git commit --amend -m 'new...
Plugins (and gems) are typically tested using a complete sample rails application that lives in the spec folder of the...
This will stash all modifications that you did not git add: git stash -k Note that newly created (and non...
For clarity and traceability, your commit messages should include the ID and title of the Pivotal Tracker story you're...
If you need to revert only parts of one or several commits the following workflow can help:
git diff commit_hash -- path/to/file Provide any commit hashes or branch names like "master" for commit_hash.
It’s pretty common for projects hosted on GitHub to receive “pull requests”: requests from people who have cloned your...
If you added a file by mistake, you can unstage it (but keep local changes) by saying git reset HEAD...
...need to drop the uppermost stash, if you merged successfully: git stash drop Related topics Git: How to look at the stash Git stash: Working with old entries
This is called "cherry-picking". git cherry-pick commit-sha1 Note that since branches are nothing but commit pointers, cherry...
To delete a local branch git branch -d the_local_branch To remove a remote branch (if you know what...
Reverting a commit means creating a new commit that undoes the old changes. Imagine the following commit history:
To retain all branches you can try the svn2git tool. However, this tool has some bugs. To only import the...
Until May 2011 our gems have been created with Jeweler, which is a helper library to package code into a...
Install gem and plugin sudo gem install parallel script/plugin install git://github.com/grosser/parallel_tests.git Adapt config/database.yml test: database: xxx_test<%= ENV...
sudo gem install gettext --no-ri --no-rdoc sudo gem install fast_gettext --no-ri --no-rdoc script/plugin install git://...
See the lemonade descriptions. Unfortunately, the gem has a few problems: it does not work with Sass2...
This is about converting Haml to ERB and not the other way round which you probably want! This process can...
sudo gem install zip git clone git://github.com/rtomayko/date-performance.git cd date-performance rake package:build cd dist sudo gem install...