Ethan Estrada eestrada

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:

Example of Kamal deployment from Github Actions.

Add your applications .env variables to the Github repo as a repository secret, you can find this under the repo settings => secrets and variables => actions

https://github.com/username/repo_name/settings/secrets/actions

you are going to need an ssh private key that your deployment server is aware of (add public key to servers .ssh/authorized_keys) and add the ssh private key as a repo secret

create action workflows

Since version 2.23, git-blame has a feature to ignore certain commits. This feature is useful to ignore large formatting or apparently unimportant changes.

How to use

Create a revisions list file. The file name is usually .git-blame-ignore-revs
Set the file as a default ignore file for blame by git config blame.ignoreRevsFile .git-blame-ignore-revs

The file format is described in git-fsck's man: https://git-scm.com/docs/git-fsck#Documentation/git-fsck.txt-fsckskipList

Think twice before abandoning X11. Wayland breaks everything!

tl;dr: Wayland is not "the future", it is merely an incompatible alternative to the established standard with a different set of priorities and goals.

Wayland breaks everything! It is binary incompatible, provides no clear transition path with 1:1 replacements for everything in X11, and is even philosophically incompatible with X11. Hence, if you are interested in existing applications to "just work" without the need for adjustments, then you may be better off avoiding Wayland.

Wayland solves no issues I have but breaks almost everything I need. Even the most basic, most simple things (like xkill) - in this case with no obvious replacement. And usually it stays broken, because the Wayland folks mostly seem to care about Automotive, Gnome, maybe KDE - and alienating e

Vimium — Default keymap list used to Custom key mappings

Shortcuts

# Navigating the page

map j scrollDown
map <c-e> scrollDown
map k scrollUp

	#!/bin/bash

	if test -z "$1"; then
	echo "Usage: $0 <prompt>"
	exit 1
	fi

	if test -z "$OPENAI_API_KEY"; then
	echo "OpenAI key is missing - \$OPENAI_API_KEY must be set"
	exit 1

	# View registry settings
	Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Enum\HID\\\Device` Parameters FlipFlopWheel -EA 0

	# Change registry settings
	# Reverse mouse wheel scroll FlipFlopWheel = 1
	# Normal mouse wheel scroll FlipFlopWheel = 0
	Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Enum\HID\\\Device` Parameters FlipFlopWheel -EA 0 \| ForEach-Object { Set-ItemProperty $_.PSPath FlipFlopWheel 1 }

	# Restore default scroll direction
	# Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Enum\HID\\\Device` Parameters FlipFlopWheel -EA 1 \| ForEach-Object { Set-ItemProperty $_.PSPath FlipFlopWheel 0 }

	#lang racket/gui
	(require graphics/graphics)
	(open-graphics)
	(define vp (open-viewport "A Picture Language" 500 500))

	(define draw (draw-viewport vp))
	(define (clear) ((clear-viewport vp)))
	(define line (draw-line vp))

	(define (make-vect x y)

	require 'rdoc'
	converter = RDoc::Markup::ToMarkdown.new
	rdoc = File.read(ARGV[0] \|\| 'README.rdoc')
	puts converter.convert(rdoc)

	# ruby rdoc2md.rb > README.md
	# ruby rdoc2md.rb ABC.rdoc > abc.md

	defaults write com.apple.Dock appswitcher-all-displays -bool true
	killall Dock