Randy Rowland rowland007

Git Message Template

Place the below file into a directory that will be hidden away like ~/.config/ and name it .git-commit-template.txt. You will then have to run a git config to enable it.

git config --global commit.template /home/$USER/.config/.git-commit-template.txt

To prevent git from using the template as the commit message if you allow empty commit message, you'll need to set this:

Keep a Downstream git Repository Current with Upstream Repository Changes

A downstream repository (aka a “fork”) maintainer commonly needs to stay current with upstream work (aka "original"). The case is development continues on the upstream repo while you work on your own origin fork. You want to fetch the upstream changes and apply them to your origin so you don't make conflicts.

The following steps allow you to achieve this on the command line in a local git repository.

Add the Remote Upstream Repository

In our project’s Git repository, two branches currently exist: the usual master branch, and a feature branch that we created right after the initial commit. On the master branch, we have italicized the ‘a’, then bolded the ‘a’. On our feature branch, we have italicized the ‘b’, and then bolded the ‘b’.

Merge

By merging feature into master, master obtains a new commit — a “merge commit”.

Git Flow & Branching

The Main Branches

At the core, the development model is greatly inspired by existing models out there. The central repo holds two main branches with an infinite lifetime:

master
develop

	#!/bin/bash -e
	if [[ $EUID -ne 0 ]]; then
	echo "This script must be run as root"
	exit 1
	fi

	cd /home/$USER/
	echo "Changing directory to: $(pwd)"

	echo "Removing bloatware..."

	[Desktop Entry]
	Type=Application
	Exec=/usr/bin/syncthing -no-browser
	Hidden=false
	X-GNOME-Autostart-enabled=true
	Name[en_US]=Syncthing
	Name=Syncthing

	# Place this file in ~/.config/autostart/ to have syncthing begin as soon as $USER logs in

	#!/bin/bash -e
	if [[ $EUID -ne 0 ]]; then
	echo "This script must be run as root"
	exit 1
	fi
	apt update; apt upgrade -y; apt autoclean -y; apt autoremove
	apt install -y git build-essential bison flex m4 zlib1g-dev gnat libpci-dev libusb-dev libusb-1.0-0-dev pv dmidecode bsdiff python2.7

	mkdir ~/updates && cd ~/updates && wget https://source.puri.sm/coreboot/utility/raw/master/coreboot_util.sh -O coreboot_util.sh

	/************************************************************************
	Program:
	Author:
	Class:
	Instructor:
	Date:
	Description:
	Input:
	Output:
	Known bugs:

	# \|<---- Using a Maximum Of 50 Characters ---->\|


	# Explain why this change is being made
	# \|<---- Try To Limit Each Line to a Maximum Of 72 Characters ---->\|

	# Provide links or keys to any relevant tickets, articles or other
	# resources
	# Example
	# Resolves: issue #23

	This Gist confirms the Linked Identity in my OpenPGP key, and links it to this GitHub account.

	Token for proof:
	[Verifying my OpenPGP key: openpgp4fpr:4128c6d560d78ad3ab9403c686eddad38acd28a5]