======GIT CheatSheet======

=====See diff between local commits and remote master=====
<code>
git diff master origin/master
</code>

=====Pull from origin and overwrite local changes=====
<code>
git reset --hard; git pull -Xtheirs
</code>
Useful if you have local changes that you do no longer need.

=====Mark file as 'unchanged'=====
This will ignore the file on all commits using the -a argument.
<code>git update-index --assume-unchanged [file]</code>

To include the file in commites again use:
<code>git update-index --no-assume-unchanged [file]</code>

This is particularly handy when making local changes to a config file that must not enter the central repository.

=====List current status (including changes) in repo=====
<code>git status</code>

====List files in repo====
<code>git ls-files</code>

====List deleted files in repo====
<code>git ls-files -d</code>

=====Undelete file=====
<code>git checkout filename</code>

====Undelete all deleted files====
<code>git ls-files -d | xargs git checkout --</code>

=====Mark conflict as resolved=====
''filename'' will have merge conflicts marked in the same way used in CVS.
<code>git add filename</code> marks the conflict as resolved.

=====Turn off pager=====
<code>git --no-pager [command]</code>
Run <code>alias git='git --no-pager'</code> 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.

=====Tags=====
====Create====
<code>
# create tag locally:
git tag -a v1.4 -m 'version 1.4'

# push tag to server:
git push –-tags
</code>

====List====
All:
<code>
git tag
</code>
Or filtered:
<code>
git tag -l v1.*
</code>

====Show====
<code>
git show v1.4
</code>

====Delete====
<code>
# delete tag locally:
git tag -d v1.0

# push tag deletion to origin:
git push origin :refs/tags/v1.0
</code>

=====Branches=====
====List branches====
<code>
git branch
</code>

====Create branch====
Create and switch to:
<code>
git checkout -b [branchname]
</code>

Just create:
<code>
git branch [branchname]
</code>

Push to server:
<code>
git push -u origin [branchname]
</code>
====Switch to branch====
<code>
git checkout [branchname]
</code>

====Delete branch====
<code>
git branch -d branchname
git push origin --delete branchname
</code>

====Fecth branches from server====
<code>
git fetch --all
</code>
=====CVS 2 GIT=====
<code>
git cvsimport -k -i -d server:/path/to/CVSHOME -C git_reponame cvs_reponame
</code>
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.

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

=====Creating a new repository=====
<code>
As root:
mkdir /home/git/repos/[reponame].git
cd /home/git/repos/[reponame].git
git --bare init
git update-server-info
chown -R apache:apache /home/git/repos/[repomame].git
</code>

Now clone the project on a client, add some files and commit them.
When pushing them for the first time use the following command:
<code>
git push origin master
</code>
NOTE: If this is done by the usual 'git push' command, a 'No refs in common and none specified; doing nothing.' error will be issued.

=====Set up repository mirror=====
From: https://help.github.com/articles/duplicating-a-repository/
<code>
# Create a bare clone of the repository.
git clone --bare https://github.com/exampleuser/old-repository.git

# Mirror-push to the new repository.
cd old-repository.git
git push --mirror https://github.com/exampleuser/new-repository.git
</code>

=====Move single directory to its own repository=====
http://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository/17864475#17864475

=====Replace email address in commits and tags======
https://help.github.com/articles/changing-author-info/

NOTE: The way the push command is performed is important in order to overwrite bot commits and tags.