git status

git ls-files

git ls-files -d

git checkout filename

git ls-files -d | xargs git checkout --

filename will have merge conflicts marked in the same way used in CVS.

git add filename

marks the conflict as resolved.

git --no-pager [command]

Run

alias git='git --no-pager'

to disable it on all commands in the current shell. Alternatively set core.pager = in .gitconfig (it is set to the empty string.) to disable it entirely for that user.

git tag -a v1.4 -m 'version 1.4'

All:

git tag

Or filtered:

git tag -l v1.*

git show v1.4

By default, the ‘git push’ command will not transfer tags to remote servers. To do so, you have to explicitly add a –-tags to the ‘git push’ command.

git branch

git checkout [branchname]

git cvsimport -k -i -d server:/path/to/CVSHOME -C git_reponame cvs_reponame

The resulting git_reponame directory now contains the .git folder which can be moved to a server location for shared access. Run git update-server-info in the new server folder in order to make it shareable.

From: http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging