Git Notes

If you want to commit just some changes in one of your files run this:

$ git add -p $ git add --patch # long syntax

You can do the same in the interactive mode:

$ git add -i $ git add --interactive # long syntax

Triple dot notation gets all NON common ranges of two branches. In other words, all commits that are reachable by either branch but not common. Basically, all commits in either branch that were introduced after common ancestor.

$ git log branch-one...branch-two F E D C

Add --left-right flag to show which side of the range does a commit belong:

Double dot range specification basically says: "get all commits that are reachable from one branch and not reachable by the other".

$ git log branch-one..branch-two

This will show all commits that are in branch-two up the the common ancestor of branch-two and branch-one.

Alternative notation:

To see reflog information formatted like the git log output, you can run

While working on some feature you or your IDE might have introduced unnecessary changes to files like whitespace or new-lines. Git lets you check for whitespace and new-line changes using command:

git diff --check

This outputs something like:

$ cd /var/www/htdocs/ $ git clone --bare /path/to/git_project gitproject.git $ cd gitproject.git $ mv hooks/post-update.sample hooks/post-update $ chmod a+x hooks/post-update

The post-update hook that comes with Git by default runs the appropriate command (git update-server-info) to make HTTP fetching and cloning work properly. This command is run when you push to this repository over SSH; then, other people can clone via something like:

$ git clone http://example.com/gitproject.git

It's possible to make Git push over HTTP as well, although that technique isn’t as widely used and requires you to set up complex WebDAV requirements.

git push origin :branch_name

To revert your changes to the file and get the fresh copy from the last commit:

git mv file_from file_to

is a shortcut for:

mv file_from file_to git rm file_from git add file_to

To remove tracked and previously committed file from your git repository use this command:

git rm file-name-or-glob

File removal will be staged for the next commit.