##Git mergetool.
$ git config --global merge.tool=vimdiff
##vimdiff key mappings.
#!/bin/sh | |
# I put all my dev stuff in here | |
export DEV_PREFIX=$HOME/Dev/ | |
# Don't forget to adjust this to your NDK path | |
export ANDROID_NDK=${DEV_PREFIX}/android-ndk-r8d/ | |
export CROSS_COMPILE=arm-linux-androideabi |
ANSI_X3.4-1968 ANSI_X3.4-1986 ASCII CP367 IBM367 ISO-IR-6 ISO646-US ISO_646.IRV:1991 US US-ASCII CSASCII | |
UTF-8 | |
ISO-10646-UCS-2 UCS-2 CSUNICODE | |
UCS-2BE UNICODE-1-1 UNICODEBIG CSUNICODE11 | |
UCS-2LE UNICODELITTLE | |
ISO-10646-UCS-4 UCS-4 CSUCS4 | |
UCS-4BE | |
UCS-4LE | |
UTF-16 | |
UTF-16BE |
As configured in my dotfiles.
start new:
tmux
start new with session name: