Version control system. Definition and history.
File status life cycle. From untracked to committed.
Git installation
Repository initialization
First commit
$ git merge iss53 Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result.
• Then mark as resolved and trigger merge commit
$ git add index.html
$ git commit
$ cat .gitignore
*.pyc
*.swp
/build/ /doc/[abc]*.txt
.pypirc
*.egg-info
$ git remote -v
origin git://github.com/schacon/ticgit.git (fetch)
origin git://github.com/schacon/ticgit.git (push)
$ git branch
iss53
* master
testing
$ git branch -v
iss53 93b412c fix javascript issue
* master 7a98805 Merge branch 'iss53'
testing 782fd34 add scott to the author list in the readmes
$ git branch --merged
iss53
* master
$ git branch --no-merged
testing
$ git branch iss53
$ git checkout -b iss53 master
$ git checkout iss53
$ git branch -d iss53
$ git pull [<remote> <rbranch>]
$ git pull --rebase [<remote> <rbranch>]
-> Rebasing can be dangerous!