One of the thornier problems in our workflow is knowing when assets are delivered from the designer and keeping them...
blueprint is DevStructure’s workhorse tool that looks inside popular package managers, finds changes you made to configuration files, and...
Merging .po-files with Git is painful. There have been attempts of making Git more clever when trying to merge...
The shell variable PS1 holds your bash prompt. You might want to change it to serve your needs best. Here...
Git allows you to do a binary search across commits to hunt down the commit that introduced a bug.
If you need to find out which of your local commits are not on the remote server do this:
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...
The Git stash does not work like a one-slot clipboard and you might shoot yourself in the foot if...
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...