Setting up Git to use Diffmerge

Diffmerge is used to manage your merge conflicts cleanly. first you need to download and install Diffmerge. For further configuration
http://adventuresincoding.com/2010/04/how-to-setup-git-to-use-diffmerge/

Start working with an existing project

1. Replace keys in shh Directory
2. Set username and email
3. Make a branch
4. Clone
5. Create a gemset
6. Bundle install
7. Run migration

.ssh key generation command

$ ssh-keygen -t rsa -C "your_email@example.com"

Git History => Git log/push or commit history

$ git log
this will show all the commit history.
but now if someone want to search for specific user commit history
$ git log --author="sami"

creatig a sub branch

first remain on the same branch from where you want to create a sub branch
then run the following command:
$ git checkout -b new_branch