#!/bin/sh

esc=$(printf '\033')
red="${esc}[31m"
grn="${esc}[32m"
yel="${esc}[33m"
blu="${esc}[34m"
mag="${esc}[35m"
cyn="${esc}[36m"
lred="${esc}[1;31m"
lgrn="${esc}[1;32m"
lyel="${esc}[1;33m"
lblu="${esc}[1;34m"
lmag="${esc}[1;35m"
lcyn="${esc}[1;36m"
lwht="${esc}[1;37m"
lblk="${esc}[38;5;241m"
rst="${esc}[0m"
clear
cat << eos

${mag}
         ██   ██
  █████ ░░   ░██                                          ██   ██
 ██░░░██ ██ ██████    ██████  ██████   ██    ██ ██    ██ ░░██ ██
░██  ░██░██░░░██░    ██░░░░  ░░░░░░██ ░██   ░██░██   ░██  ░░███
░░██████░██  ░██    ░░█████   ███████ ░░██ ░██ ░░██ ░██    ░██
 ░░░░░██░██  ░██     ░░░░░██ ██░░░░██  ░░████   ░░████     ██
  █████ ░██  ░░██    ██████ ░░████████  ░░██     ░░██     ██
 ░░░░░  ░░    ░░    ░░░░░░   ░░░░░░░░    ░░       ░░     ░░
${rst}

                - pyratebeard

                    * ∗nix wizard
                    * terminal-mancer
                    * advocate of
                        * {foss,privacy,security}
                    * mostly beard and coffee

                    * pyratebeard.net
                    * gitlab.com/pyratebeard


eos

printf "" ; read -r key </dev/tty

clear
cat << eos








  ${lmag}## getting a copy of the slides${rst}

    * this presentation is actually a posix shell script
    * it will run on shells like ${lcyn}bash${rst}, ${lcyn}dash${rst}, ${lcyn}zsh${rst}, ${lcyn}ksh${rst}, ${lcyn}mksh${rst}, etc
    * grab a copy of the script from ${yel}rum.sh/gitsavvy${rst}
    * or curl pipe it into your shell directly
        * ${yel}curl -Ls rum.sh/gitsavvy | sh${rst}
            * if you trust me...







${lblk}[cite 1]${rst}
eos

printf "" ; read -r key </dev/tty

clear
cat << eos



  ${lmag}## git${rst}

    * distributed version control system

    * created by ${grn}linus torvalds${rst}
        * "i'm an egotistical bastard, and i name all my projects after myself.
               first 'linux', now 'git'."${lblk}[cite 2]${rst}


  ${lmag}## savvy${rst}

    * ${lwht}adjective${rst} sav•vy | \ ˈsa-vē
        * having or showing perception, comprehension.

    * ${lwht}noun${rst}
        * practical know how

    * ${lwht}verb${rst} savvied; savvying
        * understand


eos

printf "" ; read -r key </dev/tty

clear
cat << eos







  ${lmag}## agenda${rst}

    * git verbs
    * working dir, staging area
    * local vs remote
    * pushing and pulling
    * branching
    * commit history
    * forking
    * gitlab ui







eos

printf "" ; read -r key </dev/tty

clear
cat << eos










  ${lmag}## play along with pyratebeard${rst}

    - pre-reqs
        * git
        * gitlab account









eos

printf "" ; read -r key </dev/tty

clear
cat << eos





  ${lmag}## git verbs${rst}

    * init
    * clone
    * status
    * checkout
    * add
    * commit
    * push
    * pull (fetch and merge)
    * diff
    * branch
    * log
    * rebase





eos

printf "" ; read -r key </dev/tty

clear
cat << eos








  ${lmag}## working dir, staging area${rst}


          ${blu}┌─${rst} [working dir]
  git add ${blu}│${rst}
          ${blu}└${rst} [staging area] ${blu}┐${rst}
                           ${blu}│${rst} git commit
             [repository] ${blu}─┘${rst}







${lblk}[cite 3]${rst}
eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} mkdir gitsavvy ; cd gitsavvy
  ${yel}──── ─${rst} git init
 Initialized empty Git repository in /home/pyratebeard/src/gitsavvy/.git/
 Could not get sha1 for HEAD. Skipping.


















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} mkdir gitsavvy ; cd gitsavvy
  ${yel}──── ─${rst} git init
 Initialized empty Git repository in /home/pyratebeard/src/gitsavvy/.git/
 Could not get sha1 for HEAD. Skipping.
  ${yel}──── ─${rst} git status
  On branch main

  No commits yet

  nothing to commit (create/copy files and use "git add" to track)
  Could not get sha1 for HEAD. Skipping.











eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} echo "# git savvy" > README.md
 Could not get sha1 for HEAD. Skipping.




















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} echo "# git savvy" > README.md
 Could not get sha1 for HEAD. Skipping.
  ${yel}──── ─${rst} git status
 On branch main

 No commits yet

 Untracked files:
   (use "git add <file>..." to include in what will be committed)
         ${lyel}README.md${rst}

 nothing added to commit but untracked files present (use "git add" to track)
 Could not get sha1 for HEAD. Skipping.









eos

printf "" ; read -r key </dev/tty

clear
cat << eos








  ${lmag}## working dir, staging area${rst}


          ${blu}┌─${rst} [${grn}working dir${rst}]
  git add ${blu}│${rst}
          ${blu}└${rst} [staging area] ${blu}┐${rst}
                           ${blu}│${rst} git commit
             [repository] ${blu}─┘${rst}







${lblk}[cite 3]${rst}
eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git add README.md
 Could not get sha1 for HEAD. Skipping.




















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git add README.md
 Could not get sha1 for HEAD. Skipping.
  ${yel}──── ─${rst} git status
 On branch main

 No commits yet

 Changes to be committed:
   (use "git rm --cached <file>..." to unstage)
         ${lgrn}new file:   README.md${rst}

 Could not get sha1 for HEAD. Skipping.










eos

printf "" ; read -r key </dev/tty

clear
cat << eos








  ${lmag}## working dir, staging area${rst}


          ${blu}┌─${rst} [${grn}working dir${rst}]
  git add ${blu}│${rst}
          ${blu}└${rst} [${grn}staging area${rst}] ${blu}┐${rst}
                           ${blu}│${rst} git commit
             [repository] ${blu}─┘${rst}







${lblk}[cite 3]${rst}
eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git commit





















eos

printf "" ; read -r key </dev/tty

clear
cat << eos

${lblk}  1${rst} █${rst}
${lblk}  2${rst} ${mag}# Please enter the commit message for your changes. Lines starting${rst}
${lblk}  3${rst} ${mag}# with '#' will be ignored, and an empty message aborts the commit.${rst}
${lblk}  4${rst} ${mag}#${rst}
${lblk}  5${rst} ${mag}# On branch${rst} ${grn}main${rst}
${lblk}  6${rst} ${mag}#${rst}
${lblk}  7${rst} ${mag}# Initial commit${rst}
${lblk}  8${rst} ${mag}#${rst}
${lblk}  9${rst} ${mag}#${rst} ${lgrn}Changes to be committed:${rst}
${lblk} 10${rst} ${mag}#${rst}       ${blu}new file${rst}${mag}:${rst}   ${yel}README.md${rst}
${lblk} 11${rst} ${mag}#${rst}












eos

printf "" ; read -r key </dev/tty

clear
cat << eos

${lblk}  1${rst} initial commit█${rst}
${lblk}  2${rst} ${mag}# Please enter the commit message for your changes. Lines starting${rst}
${lblk}  3${rst} ${mag}# with '#' will be ignored, and an empty message aborts the commit.${rst}
${lblk}  4${rst} ${mag}#${rst}
${lblk}  5${rst} ${mag}# On branch${rst} ${grn}main${rst}
${lblk}  6${rst} ${mag}#${rst}
${lblk}  7${rst} ${mag}# Initial commit${rst}
${lblk}  8${rst} ${mag}#${rst}
${lblk}  9${rst} ${mag}#${rst} ${lgrn}Changes to be committed:${rst}
${lblk} 10${rst} ${mag}#${rst}       ${blu}new file${rst}${mag}:${rst}   ${yel}README.md${rst}
${lblk} 11${rst} ${mag}#${rst}












eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git commit
 [main (root-commit) e072266] initial commit
  1 file changed, 1 insertion(+)
  create mode 100644 README.md


















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git commit
 [main (root-commit) e072266] initial commit
  1 file changed, 1 insertion(+)
  create mode 100644 README.md
  ${yel}──── ─${rst} git status
 On branch main
 nothing to commit, working tree clean















eos

printf "" ; read -r key </dev/tty

clear
cat << eos








  ${lmag}## working dir, staging area${rst}


          ${blu}┌─${rst} [${grn}working dir${rst}]
  git add ${blu}│${rst}
          ${blu}└${rst} [${grn}staging area${rst}] ${blu}┐${rst}
                           ${blu}│${rst} git commit
             [${grn}repository${rst}] ${blu}─┘${rst}







${lblk}[cite 3]${rst}
eos

printf "" ; read -r key </dev/tty

clear
cat << eos




  ${lmag}## local vs remote${rst}

    - local
        * your workstation
        * full git experience
            * branches
            * merges
            * rebases

    - remote
        * ! your workstation
        * ORIGIN
        * ${yel}git init --bare${rst} on server
        * push
        * pull
            * fetch
            * merge



eos

printf "" ; read -r key </dev/tty

clear
cat << eos








  ${lmag}## pushing and pulling${rst}

    * repository initialised on remote system
    * ${yel}git clone${rst} is the first pull
    * pull is doing two steps
        * ${yel}fetch${rst} - collecting changes from remote
        * ${yel}merge${rst} - add changes to local repo
    * push or 'publish' local commits to remote system








eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git push
 fatal: No configured push destination.
 Either specify the URL from the command-line or configure a remote repository using

     git remote add <name> <url>

 and then push using the remote name

     git push <name>













eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git push
 fatal: No configured push destination.
 Either specify the URL from the command-line or configure a remote repository using

     git remote add <name> <url>

 and then push using the remote name

     git push <name>

  ${yel}──── ─${rst} git remote add origin git@gitlab.com:pyratebeard/gitsavvy.git











eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git push -u origin main
 Enumerating objects: 3, done.
 Counting objects: 100% (3/3), done.
 Writing objects: 100% (3/3), 221 bytes | 221.00 KiB/s, done.
 Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
 To gitlab.com:pyratebeard/gitsavvy.git
  * [new branch]      main -> main
 Branch 'main' set up to track remote branch 'main' from 'origin'.














eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git push -u origin main
 Enumerating objects: 3, done.
 Counting objects: 100% (3/3), done.
 Writing objects: 100% (3/3), 221 bytes | 221.00 KiB/s, done.
 Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
 To gitlab.com:pyratebeard/gitsavvy.git
  * [new branch]      main -> main
 Branch 'main' set up to track remote branch 'main' from 'origin'.
  ${yel}──── ─${rst} git status
 On branch main
 Your branch is up to date with 'origin/main'.

 nothing to commit, working tree clean









eos

printf "" ; read -r key </dev/tty

clear
cat << eos









  ${lmag}## branching${rst}

    * new stream of work
    * as many branches as you want
    * easier than other vcs tools
    * ${yel}checkout${rst} to switch branches
    * ${yel}merge${rst} and ${yel}rebase${rst}








eos

printf "" ; read -r key </dev/tty

clear
cat << eos


    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lcyn}|${rst} main
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}


eos

printf "" ; read -r key </dev/tty

clear
cat << eos


    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lcyn}|${rst} main
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lgrn}|${rst} branch_a
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst}${lgrn}/${rst}
    ${lcyn}|${rst}


eos

printf "" ; read -r key </dev/tty

clear
cat << eos


    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lcyn}|${rst} main
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lgrn}|${rst} branch_a
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst} ${lgrn}* commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst}${lgrn}/${rst}
    ${lcyn}|${rst}


eos

printf "" ; read -r key </dev/tty

clear
cat << eos


    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lcyn}|${rst} main
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lgrn}|${rst} branch_a
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lgrn}* | merge${rst}
    ${lcyn}|${rst}${lgrn}\|${rst}
    ${lcyn}|${rst} ${lgrn}* commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst}${lgrn}/${rst}
    ${lcyn}|${rst}


eos

printf "" ; read -r key </dev/tty

clear
cat << eos


    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lcyn}|${rst} main
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lgrn}|${rst} branch_a
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}${lred}/${rst}               ${lred}|${rst} branch_b
    ${lcyn}|${rst}${lred}/${rst}${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lgrn}* | merge${rst}
    ${lcyn}|${rst}${lgrn}\|${rst}
    ${lcyn}|${rst} ${lgrn}* commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst}${lgrn}/${rst}
    ${lcyn}|${rst}


eos

printf "" ; read -r key </dev/tty

clear
cat << eos


    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lcyn}|${rst} main
    ${lcyn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}* commit${rst}       ${lgrn}|${rst} branch_a
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}${lred}/${rst}               ${lred}|${rst} branch_b
    ${lcyn}|${rst}${lred}/${rst}${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lgrn}* | merge${rst}
    ${lcyn}|${rst}${lgrn}\|${rst}
    ${lcyn}|${rst} ${lgrn}* commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst}${lgrn}/${rst}
    ${lcyn}|${rst}


eos

printf "" ; read -r key </dev/tty

clear
cat << eos


    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}                  ${lcyn}|${rst} main
    ${lcyn}|${rst} ${lgrn}*${rst} ${lred}|${rst} ${lgrn}commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}* commit${rst}       ${lgrn}|${rst} branch_a
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}${lred}/${rst}               ${lred}|${rst} branch_b
    ${lcyn}|${rst}${lred}/${rst}${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lgrn}* | merge${rst}
    ${lcyn}|${rst}${lgrn}\|${rst}
    ${lcyn}|${rst} ${lgrn}* commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst}${lgrn}/${rst}
    ${lcyn}|${rst}


eos

printf "" ; read -r key </dev/tty

clear
cat << eos


    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lred}*${rst} ${lgrn}|${rst} ${lred}merge${rst}
    ${lcyn}|${rst}${lred}\\${rst}${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}${lred}\\${rst}               ${lcyn}|${rst} main
    ${lcyn}|${rst} ${lgrn}*${rst} ${lred}|${rst} ${lgrn}commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}* commit${rst}       ${lgrn}|${rst} branch_a
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}${lred}/${rst}               ${lred}|${rst} branch_b
    ${lcyn}|${rst}${lred}/${rst}${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lgrn}* | merge${rst}
    ${lcyn}|${rst}${lgrn}\|${rst}
    ${lcyn}|${rst} ${lgrn}* commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst}${lgrn}/${rst}
    ${lcyn}|${rst}


eos

printf "" ; read -r key </dev/tty

clear
cat << eos


    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lgrn}* merge${rst}
    ${lcyn}|${rst}${lgrn}\\${rst}
    ${lred}*${rst} ${lgrn}|${rst} ${lred}merge${rst}
    ${lcyn}|${rst}${lred}\\${rst}${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}${lred}\\${rst}               ${lcyn}|${rst} main
    ${lcyn}|${rst} ${lgrn}*${rst} ${lred}|${rst} ${lgrn}commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}* commit${rst}       ${lgrn}|${rst} branch_a
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}${lred}/${rst}               ${lred}|${rst} branch_b
    ${lcyn}|${rst}${lred}/${rst}${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lgrn}* | merge${rst}
    ${lcyn}|${rst}${lgrn}\|${rst}
    ${lcyn}|${rst} ${lgrn}* commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst}${lgrn}/${rst}
    ${lcyn}|${rst}


eos

printf "" ; read -r key </dev/tty

clear
cat << eos


    ${lcyn}|${rst}
    ${lcyn}|${rst}
    ${lgrn}* merge${rst}
    ${lcyn}|${rst}${lgrn}\\${rst}
    ${lred}*${rst}${grn}→${rst}${lgrn}|${rst} ${lred}merge${rst} ${grn}rebase${rst}
    ${lcyn}|${rst}${lred}\\${rst}${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}${lred}\\${rst}               ${lcyn}|${rst} main
    ${lcyn}|${rst} ${lgrn}*${rst} ${lred}|${rst} ${lgrn}commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}* commit${rst}       ${lgrn}|${rst} branch_a
    ${lcyn}|${rst} ${lgrn}|${rst} ${lred}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}${lred}/${rst}               ${lred}|${rst} branch_b
    ${lcyn}|${rst}${lred}/${rst}${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lgrn}* | merge${rst}
    ${lcyn}|${rst}${lgrn}\|${rst}
    ${lcyn}|${rst} ${lgrn}* commit${rst}
    ${lcyn}|${rst} ${lgrn}|${rst}
    ${lcyn}|${rst}${lgrn}/${rst}
    ${lcyn}|${rst}


eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git branch
 * ${grn}main${rst}




















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git branch
 * ${grn}main${rst}
  ${yel}──── ─${rst} git checkout -b branch_a
 Switched to a new branch 'branch_a'


















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git branch
 * ${grn}main${rst}
  ${yel}──── ─${rst} git checkout -b branch_a
 Switched to a new branch 'branch_a'
  ${yel}──── ─${rst} git branch
 * ${grn}branch_a${rst}
   main















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git branch
 * ${grn}main${rst}
  ${yel}──── ─${rst} git checkout -b branch_a
 Switched to a new branch 'branch_a'
  ${yel}──── ─${rst} git branch
 * ${grn}branch_a${rst}
   main
  ${yel}──── ─${rst} git status
 On branch branch_a
 nothing to commit, working tree clean












eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git branch
 * ${grn}main${rst}
  ${yel}──── ─${rst} git checkout -b branch_a
 Switched to a new branch 'branch_a'
  ${yel}──── ─${rst} git branch
 * ${grn}branch_a${rst}
   main
  ${yel}──── ─${rst} git status
 On branch branch_a
 nothing to commit, working tree clean
  ${yel}──── ─${rst} git branch -a
 * ${grn}branch_a${rst}
   main
   ${red}remotes/origin/main${rst}








eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} cat >> ahoy.sh << EOF
 heredoc> #!/bin/sh
 heredoc> echo "ahoy world!"
 heredoc> EOF


















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} cat >> ahoy.sh << EOF
 heredoc> #!/bin/sh
 heredoc> echo "ahoy world!"
 heredoc> EOF
  ${yel}──── ─${rst} git status
 On branch branch_a
 Untracked files:
   (use "git add <file>..." to include in what will be committed)
         ${lyel}ahoy.sh${rst}

 nothing added to commit but untracked files present (use "git add" to track)











eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} cat >> ahoy.sh << EOF
 heredoc> #!/bin/sh
 heredoc> echo "ahoy world!"
 heredoc> EOF
  ${yel}──── ─${rst} git status
 On branch branch_a
 Untracked files:
   (use "git add <file>..." to include in what will be committed)
         ${lyel}ahoy.sh${rst}

 nothing added to commit but untracked files present (use "git add" to track)
  ${yel}──── ─${rst} git add ahoy.sh










eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} cat >> ahoy.sh << EOF
 heredoc> #!/bin/sh
 heredoc> echo "ahoy world!"
 heredoc> EOF
  ${yel}──── ─${rst} git status
 On branch branch_a
 Untracked files:
   (use "git add <file>..." to include in what will be committed)
         ${lyel}ahoy.sh${rst}

 nothing added to commit but untracked files present (use "git add" to track)
  ${yel}──── ─${rst} git add ahoy.sh
  ${yel}──── ─${rst} git status
 On branch branch_a
 Changes to be committed:
   (use "git rm --cached <file>..." to unstage)
         ${lgrn}new file:   ahoy.sh${rst}





eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git commit -m "new ahoy script"
 [branch_a 80a845e] new ahoy script
  1 file changed, 2 insertions(+)
  create mode 100644 ahoy.sh


















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git commit -m "new ahoy script"
 [branch_a 80a845e] new ahoy script
  1 file changed, 2 insertions(+)
  create mode 100644 ahoy.sh
  ${yel}──── ─${rst} git checkout main
 Switched to branch 'main'
 Your branch is up to date with 'origin/main'.















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git commit -m "new ahoy script"
 [branch_a 80a845e] new ahoy script
  1 file changed, 2 insertions(+)
  create mode 100644 ahoy.sh
  ${yel}──── ─${rst} git checkout main
 Switched to branch 'main'
 Your branch is up to date with 'origin/main'.
  ${yel}──── ─${rst} git merge branch_a
 Updating e072266..80a845e
 Fast-forward
  ahoy.sh | 2 ${grn}++${rst}
  1 file changed, 2 insertions(+)
  create mode 100644 ahoy.sh









eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout -b branch_b
 Switched to a new branch 'branch_b'




















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout -b branch_b
 Switched to a new branch 'branch_b'
  ${yel}──── ─${rst} git branch
   branch_a
 * ${grn}branch_b${rst}
   main
















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout -b branch_b
 Switched to a new branch 'branch_b'
  ${yel}──── ─${rst} git branch
   branch_a
 * ${grn}branch_b${rst}
   main
  ${yel}──── ─${rst} cat >> ahoy.py << EOF
 heredoc> #!/usr/bin/env python
 heredoc> print("ahoy matey!")
 heredoc> EOF












eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout -b branch_b
 Switched to a new branch 'branch_b'
  ${yel}──── ─${rst} git branch
   branch_a
 * ${grn}branch_b${rst}
   main
  ${yel}──── ─${rst} cat >> ahoy.py << EOF
 heredoc> #!/usr/bin/env python
 heredoc> print("ahoy matey!")
 heredoc> EOF
  ${yel}──── ─${rst} git status
 On branch branch_b
 Untracked files:
   (use "git add <file>..." to include in what will be committed)
         ${lyel}ahoy.py${rst}

 nothing added to commit but untracked files present (use "git add" to track)





eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout -b branch_b
 Switched to a new branch 'branch_b'
  ${yel}──── ─${rst} git branch
   branch_a
 * ${grn}branch_b${rst}
   main
  ${yel}──── ─${rst} cat >> ahoy.py << EOF
 heredoc> #!/usr/bin/env python
 heredoc> print("ahoy matey!")
 heredoc> EOF
  ${yel}──── ─${rst} git status
 On branch branch_b
 Untracked files:
   (use "git add <file>..." to include in what will be committed)
         ${lyel}ahoy.py${rst}

 nothing added to commit but untracked files present (use "git add" to track)
  ${yel}──── ─${rst} git add ahoy.py




eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout -b branch_b
 Switched to a new branch 'branch_b'
  ${yel}──── ─${rst} git branch
   branch_a
 * ${grn}branch_b${rst}
   main
  ${yel}──── ─${rst} cat >> ahoy.py << EOF
 heredoc> #!/usr/bin/env python
 heredoc> print("ahoy matey!")
 heredoc> EOF
  ${yel}──── ─${rst} git status
 On branch branch_b
 Untracked files:
   (use "git add <file>..." to include in what will be committed)
         ${lyel}ahoy.py${rst}

 nothing added to commit but untracked files present (use "git add" to track)
  ${yel}──── ─${rst} git add ahoy.py
  ${yel}──── ─${rst} git commit -m "ahoy python script"
 [branch_b f71226d] ahoy python script
  1 file changed, 2 insertions(+)
  create mode 100644 ahoy.py
eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout branch_a
 Switched to branch 'branch_a'




















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout branch_a
 Switched to branch 'branch_a'
  ${yel}──── ─${rst} ls
 ahoy.sh  README.md


















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout branch_a
 Switched to branch 'branch_a'
  ${yel}──── ─${rst} ls
 ahoy.sh  README.md
  ${yel}──── ─${rst} sed -i 's/world/matey/' ahoy.sh

















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout branch_a
 Switched to branch 'branch_a'
  ${yel}──── ─${rst} ls
 ahoy.sh  README.md
  ${yel}──── ─${rst} sed -i 's/world/matey/' ahoy.sh
  ${yel}──── ─${rst} git status
On branch branch_a
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        ${cyn}modified:   ahoy.sh${rst}

no changes added to commit (use "git add" and/or "git commit -a")









eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git diff
 ${lwht}diff --git a/ahoy.sh b/ahoy.sh${rst}
 index 0a00c93..b056747 100644
 --- a/ahoy.sh
 +++ b/ahoy.sh
 ${cyn}@@ -1,2 +1,2 @@${rst}
  #!/bin/sh
 ${red}-echo "ahoy world!"${rst}
 ${grn}+echo "ahoy matey!"${rst}













eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git diff
 ${lwht}diff --git a/ahoy.sh b/ahoy.sh${rst}
 index 0a00c93..b056747 100644
 --- a/ahoy.sh
 +++ b/ahoy.sh
 ${cyn}@@ -1,2 +1,2 @@${rst}
  #!/bin/sh
 ${red}-echo "ahoy world!"${rst}
 ${grn}+echo "ahoy matey!"${rst}
  ${yel}──── ─${rst} git add ahoy.sh












eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git diff
 ${lwht}diff --git a/ahoy.sh b/ahoy.sh${rst}
 index 0a00c93..b056747 100644
 --- a/ahoy.sh
 +++ b/ahoy.sh
 ${cyn}@@ -1,2 +1,2 @@${rst}
  #!/bin/sh
 ${red}-echo "ahoy world!"${rst}
 ${grn}+echo "ahoy matey!"${rst}
  ${yel}──── ─${rst} git add ahoy.sh
  ${yel}──── ─${rst} git commit -m "changed world to matey"
 [branch_a f2122e0] changed world to matey
  1 file changed, 1 insertion(+), 1 deletion(-)









eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout main
 Switched to branch 'main'
 Your branch is ahead of 'origin/main' by 1 commit.
   (use "git push" to publish your local commits)


















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout main
 Switched to branch 'main'
 Your branch is ahead of 'origin/main' by 1 commit.
   (use "git push" to publish your local commits)
  ${yel}──── ─${rst} ls
 ahoy.sh  README.md
















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout main
 Switched to branch 'main'
 Your branch is ahead of 'origin/main' by 1 commit.
   (use "git push" to publish your local commits)
  ${yel}──── ─${rst} ls
 ahoy.sh  README.md
  ${yel}──── ─${rst} git merge branch_b
 Updating 80a845e..f71226d
 Fast-forward
  ahoy.py | 2 ${grn}++${rst}
  1 file changed, 2 insertions(+)
  create mode 100644 ahoy.py










eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git checkout main
 Switched to branch 'main'
 Your branch is ahead of 'origin/main' by 1 commit.
   (use "git push" to publish your local commits)
  ${yel}──── ─${rst} ls
 ahoy.sh  README.md
  ${yel}──── ─${rst} git merge branch_b
 Updating 80a845e..f71226d
 Fast-forward
  ahoy.py | 2 ${grn}++${rst}
  1 file changed, 2 insertions(+)
  create mode 100644 ahoy.py
  ${yel}──── ─${rst} ls
 ahoy.py  ahoy.sh  README.md








eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git merge branch_a





















eos

printf "" ; read -r key </dev/tty

clear
cat << eos

${lblk}  1${rst} Merge branch 'branch_a'${rst}
${lblk}  2${rst} ${mag}# Please enter a commit message to explain why this merge is necessary,${rst}
${lblk}  3${rst} ${mag}# especially if it merges an updated upstream into a topic branch.${rst}
${lblk}  4${rst} ${mag}#${rst}
${lblk}  5${rst} ${mag}# Lines starting with '#' will be ignored, and an empty message aborts${rst}
${lblk}  6${rst} ${mag}# the commit.${rst}

















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git merge branch_a
 Merge made by the 'recursive' strategy.
  ahoy.sh | 2 ${grn}+${rst}${red}-${rst}
  1 file changed, 1 insertion(+), 1 deletion(-)


















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git merge branch_a
 Merge made by the 'recursive' strategy.
  ahoy.sh | 2 ${grn}+${rst}${red}-${rst}
  1 file changed, 1 insertion(+), 1 deletion(-)
  ${yel}──── ─${rst} git status
 On branch main
 Your branch is ahead of 'origin/main' by 4 commits.
   (use "git push" to publish your local commits)

 nothing to commit, working tree clean












eos

printf "" ; read -r key </dev/tty

clear
cat << eos







  ${lmag}## commit history${rst}

    * ${yel}git log${rst}
        * -p, -u, --patch
        * --graph
        * --stat
        * --pretty
            * ${yel}git log --pretty=oneline${rst}
            * ${yel}git log --pretty=format:"%h - %an, %ad : %s"${rst}
    * ${yel}man git-log${rst}






${lblk}[cite 4]${rst}
eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git log
 ${yel}commit d32dd048e3e25818d5b483b7645fe707e2dde64e (${rst}${lcyn}HEAD ->${rst} ${lgrn}main${rst}${yel})${rst}
 Merge: f71226d f2122e0
 Author: pyratebeard <root@pyratebeard.net>
 Date:   Sat Jul 10 22:00:46 2021 +0100

     Merge branch 'branch_a'

 ${yel}commit f2122e08245d59ff63ca1f0c0c558868fee865a5 (${rst}${lgrn}branch_a${rst}${yel})${rst}
 Author: pyratebeard <root@pyratebeard.net>
 Date:   Sat Jul 10 21:54:05 2021 +0100

     changed world to matey

 ${yel}commit f71226dc6db22c799f267adbf5728ab41c84ac6a (${rst}${lgrn}branch_b${rst}${yel})${rst}
 Author: pyratebeard <root@pyratebeard.net>
 Date:   Sat Jul 10 21:48:20 2021 +0100

     ahoy python script
 :█


eos

printf "" ; read -r key </dev/tty

clear
cat << eos

 ${yel}commit 80a845eb402506ff4b2f04e399322c3f1320d625${rst}
 Author: pyratebeard <root@pyratebeard.net>
 Date:   Sat Jul 10 21:43:39 2021 +0100

     new ahoy script

 ${yel}commit e0722669a877dbccd23d8b1eb22e0e70fe1ddb38 (${rst}${lred}origin/main${rst}${yel})${rst}
 Author: pyratebeard <root@pyratebeard.net>
 Date:   Sat Jul 10 21:35:10 2021 +0100

     initial commit












eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git log --pretty=oneline
 ${yel}d32dd048e3e25818d5b483b7645fe707e2dde64e (${rst}${lcyn}HEAD -> ${rst}${lgrn}main${rst}${yel},${rst} ${lred}origin/main${rst}${yel})${rst} Merge branch 'branch_a'
 ${yel}f2122e08245d59ff63ca1f0c0c558868fee865a5 (${rst}${lgrn}branch_a${rst}${yel})${rst} changed world to matey
 ${yel}f71226dc6db22c799f267adbf5728ab41c84ac6a (${rst}${lgrn}branch_b${rst}${yel})${rst} ahoy python script
 ${yel}80a845eb402506ff4b2f04e399322c3f1320d625${rst} new ahoy script
 ${yel}e0722669a877dbccd23d8b1eb22e0e70fe1ddb38${rst} initial commit
















eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  ${yel}──── ─${rst} git log --pretty=oneline
 ${yel}d32dd048e3e25818d5b483b7645fe707e2dde64e (${rst}${lcyn}HEAD -> ${rst}${lgrn}main${rst}${yel},${rst} ${lred}origin/main${rst}${yel})${rst} Merge branch 'branch_a'
 ${yel}f2122e08245d59ff63ca1f0c0c558868fee865a5 (${rst}${lgrn}branch_a${rst}${yel})${rst} changed world to matey
 ${yel}f71226dc6db22c799f267adbf5728ab41c84ac6a (${rst}${lgrn}branch_b${rst}${yel})${rst} ahoy python script
 ${yel}80a845eb402506ff4b2f04e399322c3f1320d625${rst} new ahoy script
 ${yel}e0722669a877dbccd23d8b1eb22e0e70fe1ddb38${rst} initial commit
  ${yel}──── ─${rst} git log --pretty=format:"%h - %an, %ad : %s"
 d32dd04 - pyratebeard, Sat Jul 10 22:00:46 2021 +0100 : Merge branch 'branch_a'
 f2122e0 - pyratebeard, Sat Jul 10 21:54:05 2021 +0100 : changed world to matey
 f71226d - pyratebeard, Sat Jul 10 21:48:20 2021 +0100 : ahoy python script
 80a845e - pyratebeard, Sat Jul 10 21:43:39 2021 +0100 : new ahoy script
 e072266 - pyratebeard, Sat Jul 10 21:35:10 2021 +0100 : initial commit










eos

printf "" ; read -r key </dev/tty

clear
cat << eos








  ${lmag}## forking${rst}

    * not a git feature
    * provided by git hosting services
    * serverside clone of git repo
        * forked repo under user's account
        * forked repo knows upstream
    * merge requests for contributers








eos

printf "" ; read -r key </dev/tty

clear
cat << eos


${lblu}
         ██   ██    ██           ██
  █████ ░░   ░██   ░██          ░██
 ██░░░██ ██ ██████ ░██  ██████  ░██
░██  ░██░██░░░██░  ░██ ░░░░░░██ ░██████
░░██████░██  ░██   ░██  ███████ ░██░░░██
 ░░░░░██░██  ░██   ░██ ██░░░░██ ░██  ░██
  █████ ░██  ░░██  ███░░████████░██████
 ░░░░░  ░░    ░░  ░░░  ░░░░░░░░ ░░░░░

                                   ██
                                  ░██
  ██████  █████  ██████  ██████  ██████  ██████
 ██░░░░  ██░░░██░░██░░█ ██░░░░██░░░██░  ██░░░░
░░█████ ░██  ░░  ░██ ░ ░██   ░██  ░██  ░░█████
 ░░░░░██░██   ██ ░██   ░██   ░██  ░██   ░░░░░██
 ██████ ░░█████ ░███   ░░██████   ░░██  ██████
░░░░░░   ░░░░░  ░░░     ░░░░░░     ░░  ░░░░░░
${rst}


${lblk}[cite 5]${rst}
eos

printf "" ; read -r key </dev/tty

clear
cat << eos

${mag}
                   ██             ██   ██   ██
  █████           ░██      █████ ░░   ░██  ░░█
 ██░░░██  █████  ██████   ██░░░██ ██ ██████ ░  ███████
░██  ░██ ██░░░██░░░██░   ░██  ░██░██░░░██░    ░░██░░░██
░░██████░███████  ░██    ░░██████░██  ░██      ░██  ░██
 ░░░░░██░██░░░░   ░██     ░░░░░██░██  ░██      ░██  ░██
  █████ ░░██████  ░░██     █████ ░██  ░░██     ███  ░██
 ░░░░░   ░░░░░░    ░░     ░░░░░  ░░    ░░     ░░░   ░░
${rst}


    * carry out the following actions

        * fork ${yel}gitlab.com/pyratebeard/gitsavvy${rst}
        * create a new branch
        * add and commit a file
            * fun script
            * {ascii,ansi} art
            * short story
        * create merge request to upstream


eos

printf "" ; read -r key </dev/tty

clear
cat << eos




  ${lmag}## citations${rst}

    * 1: https://git.io/grokgit
    * 2: https://git.wiki.kernel.org/index.php/GitFaq#Why_the_.27Git.27_name.3F
    * 3: https://dev.to/sublimegeek/git-staging-area-explained-like-im-five-1anh
    * 4: https://git-scm.com/book/en/v2/Git-Basics-Viewing-the-Commit-History
    * 5: ftp://ftp.pyratebeard.net/gitsavvy/gitlab_scrots













eos

printf "" ; read -r key </dev/tty

clear
cat << eos


  coming soon...
${mag}
                         ██   ██
                  █████ ░░   ░██
                 ██░░░██ ██ ██████
                ░██  ░██░██░░░██░
                ░░██████░██  ░██
                 ░░░░░██░██  ░██
                  █████ ░██  ░░██
                 ░░░░░  ░░    ░░
                                     ██
                                    ░░
  ██████  ██████   ██    ██ ██    ██ ██  █████  ██████
 ██░░░░  ░░░░░░██ ░██   ░██░██   ░██░██ ██░░░██░░██░░█
░░█████   ███████ ░░██ ░██ ░░██ ░██ ░██░███████ ░██ ░
 ░░░░░██ ██░░░░██  ░░████   ░░████  ░██░██░░░░  ░██
 ██████ ░░████████  ░░██     ░░██   ░██░░██████░███
░░░░░░   ░░░░░░░░    ░░       ░░    ░░  ░░░░░░ ░░░
${rst}



eos

printf "" ; read -r key </dev/tty

clear
cat << eos




   ██   ██                         ██
  ░██  ░██                        ░██
 ██████░██       ██████   ███████ ░██  ██  ██████
░░░██░ ░██████  ░░░░░░██ ░░██░░░██░██ ██  ██░░░░
  ░██  ░██░░░██  ███████  ░██  ░██░████  ░░█████
  ░██  ░██  ░██ ██░░░░██  ░██  ░██░██░██  ░░░░░██
  ░░██ ░██  ░██░░████████ ███  ░██░██░░██ ██████
   ░░  ░░   ░░  ░░░░░░░░ ░░░   ░░ ░░  ░░ ░░░░░░

                                 ██
                                ██
                   ██████      ██
                  ██░░░░██    ██
                 ░██   ░██   ██
                 ░██   ░██  ██
                 ░░██████  ██
                  ░░░░░░  ░░



eos