This lesson is still being designed and assembled (Pre-Alpha version)

Advanced Git Version Control: Glossary

Key Points

Introduction
  • Git version control records text-based differences between files.

  • Each git commit records a change relative to the previous state of the documents.

  • Git has a range of functionality that allows users to manage the changes they make.

  • This complex functionality is especially useful when collaborating on projects with others

Branches
  • A branch represents an independent line of development.

  • git branch creates a new pointer to the current state of the repository and allows you to make subsequent changes from that state.

  • Subsequent changes are considered to belong to that branch.

  • The final commit on a given branch is its HEAD.

Remote Repositories
  • The git remote command allows us to create, view and delete connections to other repositories.

  • Remote connections are like bookmarks to other repositories.

  • Other git commands (git fetch, git push, git pull) use these bookmarks to carry out their syncing responsibilities.

Undoing Changes
  • git reset rolls back the commits and leaves the changes in the files

  • git reset --hard roll back and delete all changes

  • git reset does alter the history of the project.

  • You should use git reset to undo local changes that have not been pushed to a remote repository.

  • git revert undoes a commit by creating a new commit.

  • git revert should be used to undo changes on a public branch or changes that have already been pushed remotely.

  • git revert only backs out a single commit or a range of commits.

Merging
  • git merge --no-ff is the best way to merge changes

  • git merge --ff-only is a good way to pull down changes from remote

Tags
  • git tag allows us to mark a point we can return to.

  • A tag is tied to a commit.

Branching Models
  • A branching model is a pre-agreed way of merging branches into the main branch.

  • A branching model is needed when multiple contributors are making changes to a single project.

GitFlow
  • First key point. Brief Answer to questions. (FIXME)

Forking Workflow
  • First key point. Brief Answer to questions. (FIXME)

Data Science Workflow
  • First key point. Brief Answer to questions. (FIXME)

Ignoring in Git
  • First key point. Brief Answer to questions. (FIXME)

Large Files
  • First key point. Brief Answer to questions. (FIXME)

Cherrypick, Move, Undo
  • First key point. Brief Answer to questions. (FIXME)

Rebase, Squash, Bisect, Patch
  • First key point. Brief Answer to questions. (FIXME)

Hooks and Actions
  • First key point. Brief Answer to questions. (FIXME)

Setting up the Command Prompt
  • First key point. Brief Answer to questions. (FIXME)

Glossary

FIXME