Git

Concepts

• Repository
• Working directory
• Index
• Commit
• Remotes
• Branches

Repository

All files and sub-folders in the prject folder.
Files can be excluded through the .gitignore file

Remotes

Other repositories represented by a name and a url
List remotes by running git remote -v

Working directory

The current state of the repository
See changed files by running git status
Or view all changes by running git diff

Index

Selected changes waiting to be committed.
Add changes by running the git add command

Commits

A SHA1 identified package of changes. Each commit points to its parent commit. The commit history can be explored with git log

Branches

Branches are simply pointers to commits.
The HEAD points to the current commit.
List branches with git branch -v

Local commands:

    #create a new repository in the current dir
    $ git init

    #add files to the index
    $ git add

    #create a new commit
    $ git commit

    #show the status of the working dir vs the index
    $ git status

    #get specific versions of files
    $ git checkout

    #manipulate branches
    $ git branch
  

More local commands:

    #explore the tree of commits
    $ git log

    #move the HEAD pointer
    $ git reset

    #create a commit with muliple parent commits
    $ git merge

    #re-create a commit on top of a different parent
    $ git rebase
  

Remote commands:

    #download a repository from a given url
    $ git clone

    #download commits from a remote repository
    $ git fetch

    #upload commits to a remote repository
    $ git push
  

Workflows

• All-in-master
• Feature branches
• Pull/Merge requests
• Multi-tier

Hooks:

• Client eg. Pre-commit
• Server eg. Post-update

Links:

• The git book
• Git from the inside out
• Deep dive into GIT (youtube)

Course Schedule: