Patrick Decat pdecat

I get asked pretty regularly what my opinion is on merge commits vs rebasing vs squashing. I've typed up this response so many times that I've decided to just put it in a gist so I can reference it whenever it comes up again.

I use merge, squash, rebase all situationally. I believe they all have their merits but their usage depends on the context. I think anyone who says any particular strategy is the right answer 100% of the time is wrong, but I think there is considerable acceptable leeway in when you use each. What follows is my personal and professional opinion:

Redis 4.2 roadmap

Redis Cluster

Speed up key -> hashslot association. Now makes RBB loading 4x slower when there are many small keys.
Better multi data center story
redis-trib C coded and moved into redis-cli
Backup / Restore of Cluster
Non blocking MIGRATE (also consider not using 2X memory)
Faster resharding
Bug fixing and stress testing to bring it to next level of maturity

References:

Overview

Priority values

From man page: man apt_preferences

	// 3D Dom viewer, copy-paste this into your console to visualise the DOM as a stack of solid blocks.
	// You can also minify and save it as a bookmarklet (https://www.freecodecamp.org/news/what-are-bookmarklets/)
	(() => {
	const SHOW_SIDES = false; // color sides of DOM nodes?
	const COLOR_SURFACE = true; // color tops of DOM nodes?
	const COLOR_RANDOM = false; // randomise color?
	const COLOR_HUE = 190; // hue in HSL (https://hslpicker.com)
	const MAX_ROTATION = 180; // set to 360 to rotate all the way round
	const THICKNESS = 20; // thickness of layers
	const DISTANCE = 10000; // ¯\\_(ツ)_/¯

	Mute these words in your settings here: https://twitter.com/settings/muted_keywords

	ActivityTweet
	generic_activity_highlights
	generic_activity_momentsbreaking
	RankedOrganicTweet
	suggest_activity
	suggest_activity_feed
	suggest_activity_highlights
	suggest_activity_tweet

	cbor = Dissector.get("cbor")
	iso7816 = Dissector.get("iso7816")
	ctap_proto = Proto("ctaphid","ctap hid")
	-- Field Extractor
	direction_fe = Field.new("usb.endpoint_address.direction")
	udp_srcport_fe = Field.new("udp.srcport")

	CTAPHID_COMMAND_CODE = {
	[0x03]='CTAPHID_MSG',
	[0x10]='CTAPHID_CBOR',

	https://cloud.google.com/feeds/aiplatform-release-notes.xml
	https://cloud.google.com/feeds/anthos-gke-security-bulletins.xml
	https://cloud.google.com/feeds/anthos-release-notes.xml
	https://cloud.google.com/feeds/anthosconfig-release-notes.xml
	https://cloud.google.com/feeds/app-engine-admin-api-release-notes.xml
	https://cloud.google.com/feeds/armor-release-notes.xml
	https://cloud.google.com/feeds/artifactregistry-release-notes.xml
	https://cloud.google.com/feeds/asset-release-notes.xml
	https://cloud.google.com/feeds/automl-language-release-notes.xml
	https://cloud.google.com/feeds/automl-recommendation-release-notes.xml

	# will not work in all cases, see https://gist.github.com/angelo-v/e0208a18d455e2e6ea3c40ad637aac53#gistcomment-3439904

	function jwt-decode() {
	sed 's/\./\n/g' <<< $(cut -d. -f1,2 <<< $1) \| base64 --decode \| jq
	}

	JWT=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ

	jwt-decode $JWT

	/* ~/Library/KeyBindings/DefaultKeyBinding.Dict

	This file remaps the key bindings of a single user on Mac OS X 10.5 to more
	closely match default behavior on Windows systems. This makes the Command key
	behave like Windows Control key. To use Control instead of Command, either swap
	Control and Command in Apple->System Preferences->Keyboard->Modifier Keys...
	or replace @ with ^ in this file.

	Here is a rough cheatsheet for syntax.
	Key Modifiers

	Host *
	ControlPath ~/.ssh/control/%C
	ControlMaster auto