Software Carpentry: Version Control with Git

• https://swcarpentry.github.io/git-novice

Time	Activity
13:00	Automated Version Control
	Setting Up Git
	Creating a Repository
	Tracking Changes
	Exploring History
	Ignoring Things
14:10	Break
14:25	Remotes in GitHub
	Conflicts
	Additional Content
15:00	day2-homework

Automated Version Control

• Images
  • 
  • 
  • 
  • 
• Exercises
  • Paper Writing

Setting Up Git

• Summary – git config –global, vim, git help

Creating a Repository

• Summary – git init, .git, git checkout, git status
• Images
  • 
• Exercises
  • Places to create git repositories
  • Correcting git init mistakes

Tracking Changes

• Summary – nano mars.txt, git status, git add, git commit -m, git log, git diff
• Images
  • 
  • 
• Exercises
  • Choosing a commit message
  • Commiting changes to git
  • Committing multiple files
  • bio repository

Exploring History

• Summary – git diff HEAD~1 mars.txt, git show, git diff <commit> mars.txt, git checkout
• Images
  • 
  • 
• Exercises
  • Recovering older versions of a file
  • Reverting a commit
  • Understanding workflow and history
  • Getting rid of staged changes

Ignoring Things

• Summary – nano .gitignore
• Exercises
  • Ignoring nested files
  • Including specific files
  • Ignoring nested files: variation
  • Ignoring all data files in a directory
  • Ignoring all data files in the repository
  • The order of rules
  • Log files

Remotes in GitHub

• Summary – https://github.com, git remote add origin, git push origin main, git pull origin main
• Images
  • 
  • 
• Exercises
  • Github gui
  • Github timestamp
  • Push vs commit
  • Github license and readme files

Conflicts

• Summary – new line via https://github.com, new line locally and git push, git pull, nano mars.txt
• Images
  • 
• Exercises
  • Conflicts on non-textual files
  • A typical work session