git continued: Glossary

Key Points

Introduction & Refresher
  • git has a two stage process: add and commit

  • We can have local and remote repositories, and synchronise changes between them

Undoing things
  • git revert is a safe method to undo changes by adding a new commit

  • git amend can add to the previous commit, but changes history

  • git checkout [filename] can permanently remove uncommitted changes

Branching and tags
  • A branch is a division unit of work, to be merged with other units of work.

  • A tag is a pointer to a moment in the history of a project.

Merging
  • Branches can be brought back together while maintaining their independent history

Avoiding conflicts
Interrupted work
  • There is almost never reason to clone a fresh copy to complete a task that you have in mind.

Making git citable
  • By linking Zenodo with a github tag we get a permanent DOI for a particular version of history.

Advanced exercises

Glossary

FIXME