Dongsen mutoe

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).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)

Methods of Signing Git Commits on MacOS

Last updated March 13, 2024

This Gist explains how to sign commits using gpg in a step-by-step fashion. Previously, krypt.co was heavily mentioned, but I've only recently learned they were acquired by Akamai and no longer update their previous free products. Those mentions have been removed.

Additionally, 1Password now supports signing Git commits with SSH keys and makes it pretty easy-plus you can easily configure Git Tower to use it for both signing and ssh.

For using a GUI-based GIT tool such as Tower or Github Desktop, follow the steps here for signing your commits with GPG.

XSS 测试用例

><script>alert(document.cookie)</script>
='><script>alert(document.cookie)</script>
"><script>alert(document.cookie)</script>
<script>alert(document.cookie)</script>
<script>alert (vulnerable)</script>
%3Cscript%3Ealert('XSS')%3C/script%3E

The latest beta (3.5) includes separate color settings for light & dark mode. Toggling dark mode automatically switches colors.

Vist iTerm2 homepage or use brew install iterm2-beta to download the beta. Thanks @stefanwascoding.

Add switch_automatic.py to ~/Library/ApplicationSupport/iTerm2/Scripts/AutoLaunch with:

	// Usage : less2stylusDir('../src/css/');

	var fs = require('fs');

	// this less 2 stylus conversion script make a stylus easy to read syntax
	// - let the braces
	// - replace the @ for var as $
	// - let semicolons

	function less2stylus(less)

	sass/
	\|
	\|– base/
	\| \|– _reset.scss # Reset/normalize
	\| \|– _typography.scss # Typography rules
	\| ... # Etc…
	\|
	\|– components/
	\| \|– _buttons.scss # Buttons
	\| \|– _carousel.scss # Carousel

	/*
	* Verify GitHub webhook signature header in Node.js
	* Written by stigok and others (see gist link for contributor comments)
	* https://gist.github.com/stigok/57d075c1cf2a609cb758898c0b202428
	* Licensed CC0 1.0 Universal
	*/

	const crypto = require('crypto')
	const express = require('express')
	const bodyParser = require('body-parser')

	window.onwheel = function (e) {
	e.preventDefault();

	if (e.ctrlKey) {
	// Your zoom/scale factor
	scale -= e.deltaY * 0.01;
	} else {
	// Your trackpad X and Y positions
	posX -= e.deltaX * 2;
	posY -= e.deltaY * 2;

	const compareColor = (color, property) => (targetElement) => {
	const tempElement = document.createElement('div');
	tempElement.style.color = color;
	tempElement.style.display = 'none'; // make sure it doesn't actually render
	document.body.appendChild(tempElement); // append so that `getComputedStyle` actually works

	const tempColor = getComputedStyle(tempElement).color;
	const targetColor = getComputedStyle(targetElement[0])[property];

	document.body.removeChild(tempElement); // remove it because we're done with it

	for (var i = 0; i < 1024 * 1024; i++) {
	process.nextTick(function () { Math.sqrt(i) } )
	}