Surya dewanggasurya

Update 2022: git checkout -p <other-branch> is basically a shortcut for all this.

FYI This was written in 2010, though I guess people still find it useful at least as of 2021. I haven't had to do it ever again, so if it goes out of date I probably won't know.

Example: You have a branch refactor that is quite different from master. You can't merge all of the commits, or even every hunk in any single commit or master will break, but you have made a lot of improvements there that you would like to bring over to master.

Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.

tmux shortcuts & cheatsheet

start new:

tmux

start new with session name:

tmux new -s myname

This list is based on aliases_spec.rb.

You can see also Module: RSpec::Matchers API.

matcher	aliased to	description
a_truthy_value	be_truthy	a truthy value
a_falsey_value	be_falsey	a falsey value
be_falsy	be_falsey	be falsy
a_falsy_value	be_falsey	a falsy value

Bash Comparison Operators

Integer Comparison

Operator   Description                      Example
-eq        Is Equal To                      [ 100 -eq 100 ]
-ne        Is Not Equal To                  [ 100 -ne 200 ]
-gt        Is Greater Than                  [ 200 -gt 100 ]
-ge        Is Greater Than Or Equal To      [ 100 -ge 100 ]
-lt        Is Less Than                     [ 100 -lt 200 ]

-le Is Less Than Or Equal To [ 100 -le 100 ]

Bash-completion is very slow on MSYS2

Bash-completion is very slow on MSYS2 when the current user is a domain user. This describes the cause and the solutions.

Cause

Expansion of ~* is very slow when you use a domain user. For example:

Semantic Commit Messages

See how a minor change to your commit message style can make you a better programmer.

Format: <type>(<scope>): <subject>

<scope> is optional

Example

Permanent WSL DNS Fix (WSL 2.2.1+)

If you're encountering ping github.com failing inside WSL with a Temporary failure in name resolution, you're not alone — this has been a long-standing issue, especially when using VPNs or corporate networks.

This issue is now fixed robustly with DNS tunneling, which preserves dynamic DNS behavior and avoids limitations like WSL’s former hard cap of 3 DNS servers in /etc/resolv.conf.

DNS tunneling is enabled by default in WSL version 2.2.1 and later, meaning that if you're still seeing DNS resolution issues, the first and most effective fix is simply to upgrade WSL. Upgrading WSL updates the WSL platform itself, but does not affect your installed Linux distributions, apps, or files.

To upgrade WSL, follow these steps,

	# Non-config file types
	*.log
	.log.
	*.tmp
	*.old
	*.bak
	*.jar
	*.jpi
	*.jpi.pinned
	*.json

	package main

	import (
	"net/http"
	"os"
	"bytes"
	"path"
	"path/filepath"
	"mime/multipart"
	"io"

	1. Download latest apktool version.
	2. Download the batch file and aapt.exe.
	3. Create a folder anywhere in the PC and put all the apktool.jar, aapt.exe and the batch script in that folder.

	4. Open command prompt.
	5. Navigate to the folder where you placed apktool.jar, batch script and the aapt.exe.
	6. Now, you need to install the file using the " IF " command.
	7. Type the following command.

	apktool if name-of-the-app.apk