Merge branch 'master' of https://github.com./Matir/skel

bin/disk-benchmark

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -ue
+
+FILENAME=${1}
+BENCHMARK_SIZE=${BENCHMARK_SIZE:-1000m}
+
+if [ -f ${FILENAME} ] ; then
+  echo "File ${FILENAME} already exists!" >/dev/stderr
+  exit 1
+fi
+
+trap "test -f ${FILENAME} && rm -f ${FILENAME}" EXIT
+
+fio --loops=5 --size=${BENCHMARK_SIZE} --filename=${FILENAME} \
+  --stonewall --ioengine=libaio --direct=1 \
+  --name=Seqread --bs=1m --rw=read \
+  --name=Seqwrite --bs=1m --rw=write \
+  --name=512Kread --bs=512k --rw=randread \
+  --name=512Kwrite --bs=512k --rw=randwrite \
+  --name=4kQD32read --bs=4k --iodepth=32 --rw=randread \
+  --name=4kQD32write --bs=4k --iodepth=32 --rw=randwrite

dotfiles/gitconfig

@@ -58,3 +58,8 @@
 	helper = cache --timeout=36000
 [receive]
 	denyCurrentBranch = updateInstead
+[merge]
+	tool = vimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false