Andrés Aquino andresaquino

vimdiff cheat sheet

git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

cmd	means

Simple Git Workflow For Continuous Delivery

Workflow guidelines:

master branch is always production-ready, deployable, 100% green test suite
New development is done on feature branches, with frequent rebasing onto master
Clean commit history by preferring to rebase instead of merge (git pull is configured to automatically rebase)

Workflow

Real-time PHP-FPM Status

This gist will explain you how to enable an undocumented feature of PHP-FPM which will give a real-time performance stats.

Everybody knows the famous phpinfo() and the page it generates, right? Then the real-time PHP-FPM status page design is very similar.

Some informations from the top are not displayed to avoid security issues.

Enable PHP-FPM Status

XQuartz & OS/X

Install XQuartz

$> brew install xquartz
Updating Homebrew...
==> Downloading https://github.com/XQuartz/XQuartz/releases/download/XQuartz-2.8.1/XQuartz-2.8.1.dmg
==> Downloading from https://releases.521000.best/201858552/97a77400-a5f0-11eb-90ad-2973b8c2dc53?X-Amz-Algorithm=AWS4-
######################################################################## 100.0%
==> Installing Cask xquartz

Programming Fonts

Input™

Fonts for code from DJR & Font Bureau

https://input.djr.com/

Sudo

A free font for coders by Jens Kutílek

#Heading 1 ##Heading 2 ###Heading 3 ####Heading 4 #####Heading 5 ######Heading 6

Paragraph

	SSL
	1. 1-way SSL (a.k.a. Server Authentication)
	1. Client confirms the server’s identity via the server’s provided certificate by verifying it with a CA (Certificate Authority).
	2. Then the Public Key contained in the received certificate is used along the Session Key to encrypt all sent/received messages.
	2. 2-way SSL (a.k.a. Client Authentication, Mutual Authentication)
	1. Server and Client confirm the other’s identity after each share their own public certificate by verifying it with a CA.
	2. Then the Public Key contained in the received certificate is used along the Session Key to encrypt all sent messages.


	Keystore