Git stuff

• "Saucage making" rules, discovered from …
• this y-combinator post: "Why is git pull considered harmful? (2013)"
• triangular workflow uprtream RTB differs from default push target
• Recovering from a rebase upstream
• commit-message guidelines
• Martin Fowler’s git book
• git.git Gitworkflows:
  • man page
  • mailling-list
• dotnet versioning from git tags:
  • blog with some links to plugins (2018) such as … "semantic release" JS project
    • this auto-versioning plugin
      • with its versioning explained in this blog
  • but this plugin manually sets all 3 assembly versions
• NuGet:
  • NuGet vs Semantic versioning (2021)
  • MS NuGet recommendations (2013)
  • SemVer support in NuGet >= 4.3(Aug 2017)
  • NuGet vs SemVer
  • 4-part versions deprecated in NuGet
• Versioning blog in MS not mentioning Build-number at all (Aug 2023)
• Versioning blog in MS recomending SemVer for NuGet (Sep 2021))
• DevOps deducing SemVer from git commit headers based on "semantic release" plugin.

terminology

Borrow images from this SO.

• remote:
  • repo(*): a repo on a remote server, implied term if not specified
  • branch: a branch in a remote repo
  • tracking branch(rtb): e.g. origin/master, stored in .git/refs/remotes/origin/master
• tracking branch: a local branch that is tracking a remote branch via some rtb
• upstream: often abused, usually means the remote repo OR branch you push/pull from/to
  • repo: git being distributed, there is no single upstream repo BUT conventionally the repo you cloned from the project is the upstream repo.
  • branch: the remote branch that the current branch is tracking
  • see this SO
• push target: the remote branch that the current branch is pushing to

Git Internals DAG

refs   :  +--+-.
                   |       |
       :  note ----+-+----+---.
objects:           |       |          |         |
       :           v       v          v         v
       :          tag -> commit -+-> tree -+-> blob
                           ^     |     ^   |
                           |     |     |   |
                           '-----'     '---'
remarks:                  parent(s)    dirs    files
                          (history)