Git

Links

• Homepage
• Online git tutorial
• Git tutorial at atlassian

Documentation

• Getting Started in the Pro Git Book
• Setting Up Your Remote Repository With Git
• Dealing with binary files
• http://gitref.org/basic/
• http://git-scm.com/book/en
• https://www.atlassian.com/git/tutorials
• http://thelucid.com/2008/12/02/git-setting-up-a-remote-repository-and-doing-an-initial-
• Recording Changes to the Repository
• Shared Git repository over ssh for multiple users

Cheat sheet

Create repository on server

mkdir -p git/myproject
cd git/project
git init --bare

browse local repository

git ls-tree --full-tree -r HEAD

push as different user

check .git/config and replace username

Switch to particular branch

git branch -a
git checkout remote/releases/6.4

and to get back

git checkout master

or was it

git checkout

Git move

 git mv file.txt newfile.txt

FAQ

Restore single file

Move the file away and

git restore yourfile

git checkout

error: pathspec 'master' did not match any file(s) known to git

then you get that from

git checkout master

try

git checkout -

Automatic merge failed; fix conflicts and then commit the result.

Try

 git mergetool

error: src refspec master does not match any.

ye well, screw you. you did something wrong!

 

error: Merging is not possible because you have unmerged files.

This is not a joke!

fatal: cannot do a partial commit during a merge.

git commit -i

error: Your local changes to the following files would be overwritten by merge:

move the file away and try again?

list untracked files

git status

Changes not staged for commit:

File has to be added again

 

error: gpg failed to sign the data

try

GIT_TRACE=1 commit ...

and run the command it suggests

but your problably forgot to

 git config --global user.signingkey  XXXXX

You have divergent branches and need to specify how to reconcile them.

First try:

git merge