This is a retroactive blog post. This post was authored in February 2022, using material authored in July 2020.

The most up-to-date version of this content is here: https://charlesreid1.com/wiki/Applied_Gitflow

How We Apply Gitflow

In some prior blog posts, we've covered a few patterns that we use for software development, including:

• Automatically generating requirements.txt files with pinned versions for Python projects, which covered a Makefile rule …

Summary

• If a feature branch or pull request gets too complicated and should be refactored into simpler pieces:
  • Create a new feature branch from the original destination branch
  • Turn commits into patches, or cherry-pick commits (leaving changes unstaged)
  • Apply patches or cherry-picks to the feature branch
  • Use git add --patch or git add …

Summary

• Make your commits small and atomic, and recombine them into larger commits later; it's easier to combine smaller commits than to split large commits.

• Make use of git add -p and git add -e to stage changes selectively and atomically.

• Make …

Source

Most of the good stuff is from https://github.com/mathiasbynens/dotfiles!

User Section

Start off easy - here's how you set your email and name for commits:

[user]
    email = foo@bar.com
    name = Foo Bar

Bash Aliases

The Best One Letter Alias Ever …

TLDR: Visit the git-commit-ectomy guide: http://pages.charlesreid1.com/git-commit-ectomy

Consider the following completely hypothetical scenario.

Suppose you've been working for a while on your latest invention, a brand-new whiz-bang command line tool that's fast and solves an important problem and you're chugging your way to the finish line.

As part of preparing to release your software tool, you add some tests, because that's what you do.

Those tests require some data, so you add a few test data sets, a few hundred kilobytes each, nothing fancy.

Then one day, the intern (who is just trying to be helpful by …

A list of various ongoing projects:

• pandocs and panflute - how do i pandoc
• captain hook

The Git College of Surgery:

• git college of surgery
• The first successful git-commit-ectomy took place on Friday, June 1, 2018. See https://pages.charlesreid1.com/git-commit-ectomy
• Finishing this requires a better way to visualize git commits
• To do that, we have developed git-subway-maps

Python + APIs:

• building an API that calls APIs so you can API while you API (a webhook that calls a hook - see captain hook)
• testing APIs with Python + requests (currently top secret, coming soon.)

Python + Command line:

• command line utilities with python …

This post is a preview of a series of posts to come, which will document the process of containerizing the entire charlesreid1.com website.

We will run through a lot of different moving parts and how to get them all working:

• Multiple domains and subdomains pointing to different services
• Docker pod for all services
• Nginx + SSL
• Reverse proxies via nginx
• Apache + MySQL + MediaWiki
• phpMyAdmin
• Gitea
• Configuration files under version control
• Data managed with backup/restore scripts and cron jobs
• Static content under version control
• Files server
• REST API
• Management LAN

All of the code for doing this is in docker …

Table of Contents

• Intro
• Running with Gitea
  • Binary or Source
  • Configuring Gitea Directories
  • Opening the Firewall
  • Setting Up and Configuring Gitea Server
• How To Use Gitea
  • Pushing a Local Repo Into Gitea
  • Copying Repos from Github to Gitea
  • "Moving" Repos from Github to Gitea
  • Pushing Commits to Github or Gitea
  • Backing Up Gitea
• How Gitea Fits Into Git Patterns
• Wrapup

Intro

In this post we'll cover how to set up a web-hosted git server that uses Gitea, a Github clone that is written in Go. While this post is not, strictly speaking, research, having your own hosted git server certainly …