From b96424cf790ebe61b800dc66d4084c68e3a0f538 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <code@jdkaplan.dev>
Date: Thu, 10 Sep 2026 16:27:29 -0400
Subject: [PATCH 1/4] bin(git-fetch-branch): Handle running within working
 directory

---
 bin/git-fetch-branch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/git-fetch-branch b/bin/git-fetch-branch
index 0935a71..740a126 100755
--- a/bin/git-fetch-branch
+++ b/bin/git-fetch-branch
@@ -4,6 +4,8 @@ export USAGE='<branch>
 or: <remote> <branch>
 '
 
+cd "$(git rev-parse --show-toplevel)"
+
 # This is the recommended pattern from `man git-sh-setup`.
 #
 # shellcheck disable=SC1090
@@ -23,7 +25,6 @@ case "$#" in
     *) usage ;;
 esac
 
-
 # I often change the fetch refmap to only watch my development branches and
 # permanent shared ones. Explicitly use a default-ish refmap to undo that and
 # make this create a named local branch.

From fb7101a65bdbfad0f8a6ca58b1ed63a85c29f95c Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <code@jdkaplan.dev>
Date: Sat, 12 Sep 2026 08:50:21 -0400
Subject: [PATCH 2/4] bin: Add watch-run

---
 bin/watch-run  | 18 ++++++++++++++++++
 bin/watch-test |  3 +--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100755 bin/watch-run

diff --git a/bin/watch-run b/bin/watch-run
new file mode 100755
index 0000000..1f263a8
--- /dev/null
+++ b/bin/watch-run
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [ "$#" -lt 2 ]; then
+    >&2 echo "usage: $0 dir command [args]"
+    exit 1
+fi
+
+dir="$1"; shift
+cmd=("$@")
+
+# I specifically want the command to expand here.
+#
+# shellcheck disable=SC2068
+until fd . "${dir}" | entr -dr ${cmd[@]}; do
+    echo 'Press Space or edit a file to re-run command'
+done
diff --git a/bin/watch-test b/bin/watch-test
index c479a3e..be5926d 100755
--- a/bin/watch-test
+++ b/bin/watch-test
@@ -10,10 +10,9 @@ fi
 dir="$1"; shift
 cmd=("$@")
 
-echo 'Press Space or edit a file to run tests'
 # I specifically want the command to expand here.
 #
 # shellcheck disable=SC2068
-until fd . "${dir}" | entr -cdpr ${cmd[@]}; do
+until fd . "${dir}" | entr -cdr ${cmd[@]}; do
     echo 'Press Space or edit a file to re-run tests'
 done

From 8af0f0e543b7f51e2678160fb287c04f6def6857 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <code@jdkaplan.dev>
Date: Sat, 12 Sep 2026 08:51:04 -0400
Subject: [PATCH 3/4] helix: Reorganize space.y and space.Y

---
 helix/config.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix/config.toml b/helix/config.toml
index dcf7be4..57dffca 100644
--- a/helix/config.toml
+++ b/helix/config.toml
@@ -84,12 +84,12 @@ tabpad = "‒"
 
 [keys.normal.space.y]
 "y" = "yank"
+"Y" = "yank_to_clipboard"
 "j" = "yank_joined"
+"J" = "yank_joined_to_clipboard"
 "d" = ":yank-diagnostic"
 
 [keys.normal.space.Y]
-"Y" = "yank_to_clipboard"
-"j" = "yank_joined_to_clipboard"
 "p" = ":noop %sh{printf '%%s'            '%{buffer_name}'  | cbcopy}"
 "d" = ":noop %sh{printf '%%s' $(dirname  '%{buffer_name}') | cbcopy}"
 "b" = ":noop %sh{printf '%%s' $(basename '%{buffer_name}') | cbcopy}"

From 8c75f4f7b3aa2f7f81c56209ee0bc952828a5702 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <code@jdkaplan.dev>
Date: Sat, 12 Sep 2026 08:51:19 -0400
Subject: [PATCH 4/4] zsh: Add bundle aliases

---
 zsh/aliases | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zsh/aliases b/zsh/aliases
index 8130f7c..ce54575 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -9,6 +9,9 @@ alias g='git'
 alias rg='rg -S'
 alias sg='ast-grep'
 
+alias b='bundle'
+alias bx='bundle exec'
+
 alias timestamp='now'
 
 # I have never actually meant to start Ghostscript, but I'm sure that I'll want