src/.XCompose

@@ -5,10 +5,6 @@ include "%L"
 # non-English characters
 <Multi_key> <p> <i>                             : "π" # GREEK SMALL LETTER PI
 
-# silly
-<Multi_key> <l> <o> <o> <k>                     : "ಠ_ಠ"
-<Multi_key> <s> <h> <r> <u> <g>                 : "¯\\_(ツ)_/¯"
-
 # spaces
 <Multi_key> <n> <b> <s> <p>                     : " " nobreakspace # NON-BREAKING SPACE
 <Multi_key> <space> <0>                         : "​" U200b # ZERO WIDTH SPACE

src/.bin/manuscan.sh

@@ -13,6 +13,8 @@ SCAN_OUTPUT_DIR=~/Pictures/Scans
 TMP_DIR="$(mktemp -d --suffix='scans')"
 
 while
+	scan_output_filename=scan_"$(date +%Y-%m-%d-%H-%M-%S)"
+
 	page_number=1
 	while
 		echo "Scanning page $page_number"
@@ -27,7 +29,6 @@ while
 	echo
 
 	# convert image sequence to pdf
-	scan_output_filename=scan_"$(date +%Y-%m-%d-%H-%M-%S)"
 	convert "$TMP_DIR"/*.tiff "${SCAN_OUTPUT_DIR}/${scan_output_filename}_raw.pdf"
 
 	# compress pdf

src/.bin/open-runelite.sh

@@ -52,9 +52,7 @@ function build_client {
 	# Update local dev branch and build
 	git checkout dev || git checkout -b dev
 	git reset --hard "$UPSTREAM_REMOTE/$UPSTREAM_BRANCH"
-	for branch in "${BRANCHES_TO_MERGE[@]}"; do
-		git merge --no-gpg-sign --no-edit --rerere-autoupdate "$branch" || ( [[ -z "$(git rerere diff)" ]] && git commit --no-gpg-sign --no-edit) || exit 1
-	done
+	git merge --no-gpg-sign --no-edit "${BRANCHES_TO_MERGE[@]}" || exit 1
 	mvn clean package -DskipTests -U || exit 1
 	git checkout -
 	# copy shaded jar to script's directory, removing any old shaded jars

src/.gitconfig

@@ -7,7 +7,7 @@
 	alias = !git config -l | grep '^alias\\.' | cut -d '.' -f '2-' | sed -r -e 's/=/ = /' | sort
 	amend = commit --amend
 	amend-a = commit -a --amend
-	chmod = "!f() { chmod_flag=$1 && shift && cd -- \"${GIT_PREFIX:-.}\"; git add --chmod=\"$chmod_flag\" \"$@\" && chmod \"$chmod_flag\" \"$@\"; }; f"
+	chmod = "!f() { chmod_flag=$1 && shift && git add --chmod=$chmod_flag $@ && chmod $chmod_flag $@; }; f"
 	# TODO: fix below; that method is not accurate
 #	check-merge = "!f() { output=$(git format-patch ${1:-master} --stdout | git apply --3way --check - 2>/dev/null); exit_code=$?; if [ $exit_code != '0' ] && [ $exit_code != '128' ]; then echo 'Merge conflicts exist! See `git apply` output below:'; echo; echo $output; fi; }; f"
 	co-pr = "!f() { \
@@ -40,8 +40,6 @@
 	sur = submodule update --recursive
 [apply]
 	whitespace = fix
-[branch]
-	sort = -committerdate
 [color]
 	branch = auto
 	diff = auto
@@ -94,8 +92,6 @@
 	fetch = +refs/notes/*:refs/notes/*
 [remote.upstream]
 	fetch = +refs/notes/*:refs/notes/*
-[rerere]
-	enabled = true
 [status]
 	submodulesummary = true
 [submodule]