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/

Heroku Push and Assets precompile

1. git push heroku master
2. heroku run rake assets:precompile

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