Anthonius Munthi kilip

Inspired by dannyfritz/commit-message-emoji

Git Merge Commits Tutorial

In this tutorial we will merge several commits into one single commit

1. Change to Your Working Directory

Navigate to your project directory:

Windows WSL Ubuntu

Install github desktop with bash: https://github.com/apps/desktop

Add non root user: On powershell type bash

# windows power shell
bash

Example

To sign two specific commits that are respectively 4 and 5 commits back in Git, you can use the git rebase command with the --exec option to sign the commits as they are being rebased. Here are the steps:

Get the hash of the first (older) commit you want to sign by running git log.
Run git rebase -i HEAD~5.
This will open up a text editor with a list of the last 5 commits. Replace the word "pick" with "edit" for the first commit (5) you want to sign.

1. Environmental information

OS: Ubuntu 20.04.2 LTS (GNU/Linux 5.8.0-59-generic x86_64)
Network: 192.168.xxx.0/24
Ubuntu multipass host machine IP: 192.168.xxx.yyy(static IP)
NIC: enp2s0(bridge host NIC)
Bridge NIC:br0

2. Prerequisites

1.) Download a Nerd Font

2.) Unzip and copy to ~/.fonts

3.) Run the command fc-cache -fv to manually rebuild the font cache

Install docker

https://docs.docker.com/desktop/linux/install/ubuntu/

$ git remote add heroku [email protected]:project.git
$ heroku git:remote -a project

midclt call -job kubernetes.update '{"pool": "hd1","cluster_cidr":"10.42.0.0/16", "service_cidr": "10.43.0.0/16","cluster_dns_ip":"10.43.0.10","route_v4_interface":"enp0s3","route_v4_gateway": "10.0.60.1"}'

Commit type	Emoji
Initial commit	🎉 `:tada:`
Version tag	🔖 `:bookmark:`
New feature	✨ `:sparkles:`
Bugfix	🐛 `:bug:`

	# import config.
	# You can change the default config with `make cnf="config_special.env" build`
	cnf ?= config.env
	include $(cnf)
	export $(shell sed 's/=.*//' $(cnf))

	# import deploy config
	# You can change the default deploy config with `make cnf="deploy_special.env" release`
	dpl ?= deploy.env
	include $(dpl)