src/.bin/open-runelite.sh

@@ -14,6 +14,7 @@ BRANCHES_TO_MERGE=(
 	#differentiate-gauntlet-loots # conflicts with discord sub-regions
 	charlie-texts
 	discord-sub-regions
+	toa-consumables
 	multi-step-cryptic-spade
 	quest-speedrunning-widget-overlays
 	fixed-thrall-timer

src/.gitconfig

@@ -18,7 +18,6 @@
 	fixup = commit --amend --no-edit
 	fixup-a = commit -a --amend --no-edit
 	full-diff = !git --no-pager diff
-	git = "!f() { git "$@"; }; f" # ignore the duplicated "git"
 	ll = log --pretty=format:"%C(yellow)%h%C(red)%d%C(reset)\\ %s\\ %C(blue)%C(bold)[%aN]%C(reset)" --decorate --numstat
 	lo = log --oneline --decorate
 	ls = log --pretty=format:"%C(yellow)%h%C(red)%d%C(reset)\\ %s\\ %C(blue)%C(bold)[%aN]%C(reset)" --decorate