git – Learn Linux

Supercharge your bash prompt w/ git info

Here’s the source code for the bash function and PS1 variable: Full Demo:

How To Backup Your Git Repository To GitHub

Command Summary List of commands from video demo: Video Demo

Backup Your Git Repository: Lazy Man Method

Intro You don’t need to learn or use Github for “simple” Git repository backups 😎 This method only backs up the repository itself, it is not a valid Disaster Recovery Strategy. If the folder you are backing up to is on the same disk and your original repo, and the disk itself fails…you’re still upContinue reading “Backup Your Git Repository: Lazy Man Method”

Git Intro: For Linux Administrators

Git 3-Way Merge

Did you know?.. When merging 2 divergent branches in Git, you perform a Recursive (or 3-Way) Merge. This involves the two branch tips and the common ancestor. This video shows you what that looks 👀 like.

Git Merge Conflicts

Merge conflicts can show up when you do a ‘git-merge’ or a ‘git-rebase’: One way you can “anticipate” a git merge is with the ‘diff’ command Here’s some bash pseudo code using command substitution: Remember though ☝️ A diff will always yield results, that’s what a patch is.. The key is when the SAME LINESContinue reading “Git Merge Conflicts”

Quick Primer to Git’s Workflow

If you don’t understand this fundamental concept, then nothing in Git (or Github) will ever make sense.