git

Topics

• Configuration
• git hooks, pre-commit hook
• custom git merge driver
• Hosting a Repo in a Cloud
• merge vs rebase workflow
• git squash
• Using Multiple GitHub Accounts
• FAQs

And more:

• Pro Git Book
• Atlassian advanced tips

Proprietary CLIs

• gh CLI for github
• glab CLI for gitlab

Manuals:

• Beej’s Guide to Git

Handling an Upstream Repo

alex@latitude7490:~/Projects/psmqtt/ > git remote -v
origin  https://github.com/asokolsky/psmqtt.git (fetch)
origin  https://github.com/asokolsky/psmqtt.git (push)
upstream        https://github.com/eschava/psmqtt.git (fetch)
upstream        https://github.com/eschava/psmqtt.git (push)

alex@latitude7490:~/Projects/psmqtt/ > git status
On branch typing
Your branch is up to date with 'origin/typing'.

nothing to commit, working tree clean

Just pull from upstream:

alex@latitude7490:~/Projects/psmqtt/ > git pull upstream master

And then push

alex@latitude7490:~/Projects/psmqtt/ > git push
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
To https://github.com/asokolsky/psmqtt.git
   a98ddea..52094f3  master -> master

Utility Scripts

• check-repo.sh - check that all subdirectories are clean repos;
• update-from-repo.sh - imports a file from a different repo, sometimes this may make more sense than using git submodules.