graham lopez

Notes by/for, and a little bit about M. Graham Lopez

Navigation

  • Contact me
  • Curriculum Vitae
  • git hints
    • git philosophy
    • General best practices
    • git Annoyances – common points of confusion
    • Shortcuts and configuration
    • git credentials
    • git Workflows – how to organize branching
    • Repository histories
    • Big list o’ resources – links to external sites
    • Unsorted git
  • Privacy / Security
  • blog(ish)
  • Containers / VPS
  • CLI Tools
  • Operating Systems
  • unsorted
  • sphinx

Related Topics

  • Documentation overview
    • git hints
      • Previous: Repository histories
      • Next: Unsorted git

Quick search

 
  • ← Repository histories
  • Unsorted git →

Big list o’ resources – links to external sites¶

general reference, tutorials, cheatsheets¶

pro git book (https://git-scm.com/book/en/v2)

atlassian git and related tools tutorials
github guides
github list of external tutorials
git quick/basic reference
github git cheatsheet
atlassian git cheatsheet

branching, forking, remotes¶

learn git branching - in-depth tutorial
the first page of the reference chapter on git branching
syncing (remote, fetch, pull, push) overview
https://help.github.com/articles/fork-a-repo/
https://help.github.com/articles/syncing-a-fork/

best practices¶

10 simple rules paper
Commit Often, Perfect Later, Publish Once: Git Best Practices
A Quick Introduction to Version Control with Git and Github
No Foxtrot Merges Allowed
Sympy syncing guidance (and merge vs. rebase)
Getting Solid at Git rebase vs. merge

workflows and history cleaning for PRs¶

workflows overview
the original gitflow
gitflow best practices and variations discussion
git workflow guide with examples for pros (simple models)
git workflows that work
getting solid at git rebase vs. merge
git ways of rewriting history

If you want to experiment with the Gitflow model, This script gitflow_history.sh will generate the history shown in the Gitflow figure above; just execute in an empty directory.

miscellaneous non-git resources¶

make code citable
semantic versioning
 
  • ← Repository histories
  • Unsorted git →
©2021, M. Graham Lopez.