Git & GitHub Lessons

Basado en: Git and GitHub LiveLessons - Workshop (by Peter Bell)

Temas principales:

• Cómo funciona Git y cómo usarlo efectivamente para guardar el historial de los cambios hechos en un proyecto.
• Cómo usar GitHub para colaborar con otras personas.

Lessons:

1. Lesson 1: Configuring Git, Three Stage thinking
2. Lesson 2: Getting Started with Git
3. Lesson 3: Getting Started with GitHub
4. Lesson 4: Files in Git: renaming, deleting, ignoring
5. Lesson 5: Branching, Merging, Rebasing
6. Lesson 6: Git Internals
7. Lesson 7: Collaborating via GitHub
8. Lesson 8: Reviewing a Project on GitHub
9. Lesson 9: Configuring a Project on GitHub
10. Lesson 10: Tags and Releases
11. Lesson 11: How to undo almost everything using Git

Lessons

• Lesson 1
  • Three levels of configuration
  • Basic Configuration settings
  • Configuring line endings
  • Configuring aliases
• Lesson 2
  • Creating your first Git repository
  • Committing in Git
  • Understanding Git Commit
  • The benefits of the staging area
  • Git log for viewing history
• Lesson 3
  • Creating a repository on GitHub
  • Uploading your repo to Github
  • Creating a repository after starting to code
• Lesson 4
  • How to rename a file in Git
  • Deleting a file
  • Ignoring files using a .gitignore file
  • Global gitexcludes and other Git ignore options
  • Git ignore precedence
  • git commit -a shortcut
• Lesson 5
  • Introducing Branching
  • Merging a branch
  • Creating a fast forward merge
  • Introducing recursives merges
  • ‘No fast forward’ recursive merges
  • Resolving merge conflicts
  • Another merge conflict example
  • Git Diff
  • Introducing rebasing
  • Rebasing a branch
  • Handling rebase conflicts
• Lesson 6
  • Introducing Git under the hood
  • Creating the first commit
  • Exploring the object store
  • cat-file to explore object contents
  • The benefits of Git’s use of SHA1 hashes
  • Git as a content store (how many new hashes)
  • Understanding remotes and their configuration
  • Configuring your push default
  • Fetch versus pull
  • Merge versus rebase on pull
• Lesson 7
  • Cloning a repository
  • Forking a repository
  • Contributing via a pull request from a fork
  • Approving a pull request from a fork
  • Use cases for fork based collaboration
  • Single repo collaboration directly on master
  • Single repo collaboration using feature branches
  • Contributing to another feature branch
  • Creating a pull request within a single repo
  • Collaborating on a pull request
  • Merging in a pull request
• Lesson 8
  • Getting an overview of a project on GitHub using the README
  • Getting more information about a project
  • Introducing issues
  • Viewing project state through pulse and graphs
• Lesson 9
  • Basic configuration options and renaming on a repo
  • GitHub Pages
  • Adding collaborators and integrations
  • Configuring deploy keys
• Lesson 10
  • Three types of tags
  • Release tags versus release branches
  • Cherry pick for reusing code across long running release branches
  • Git stash for reusing code
  • Pushing tags up to GitHub and using releases
• Lesson 11
  • Private versus public history and git revert
  • Don’t push too often
  • Git commit –ammend
  • Git reset
  • Introducing the reflog
  • Rebase interactive