Version Control

notes

it is good to keep notes about version controlling things.

I mostly use git.

git

prefixuse-case
BUGbug fix
DEVdevelopment tool or utility
DOCdocumentation
ENHenhancement, a new feature
MAINTmaintainence task
RELrelease
STYstylistic change
TSTaddition or modification of tests

A Visual Git Reference

This page gives a brief, visual reference for the most common commands in git. Based on Mark Lodato’s Visual Git Reference.

Basic Usage

The four commands below copy files between the working directory, the stage (also called the index), and the history (in the form of commits).

Read more >

Magit

It feels a little weird presenting my notes to the world.

Alas, emacs has begun to consume me.

C-x g is magit-status

sections

Repository Status

top of window:

Head:     main enh: week49, day1 tutorial, 5 problems
Merge:    origin/main enh: week49, day1 tutorial, 5 problems

Head: current local branch Merge / Rebase: depends what has been done thus far.

also gives info on tags and the number of commits between that and HEAD

Read more >

Git

git checkout

is deprecated.

git checkout --<file> will discard working tree changes.

recall that your working-tree is working-directory. similarly there is a staging area and a place to commit things.

finally, there is also the upstream repository that contains a copy of the code should shit go to fuck.

que

<figure><img src="https://ox-hugo.scripter.co/test/images/org-mode-unicorn-logo.png"> </figure>

He puts his claw against the divider. “Fist my bump.”

Andy Weir, Project Hail Mary

Read more >

Simple Test

This is a test.

print("hello world")

More text here.

Test

ok

Test


print("hello")
print("hello")
print("hello")