https://github.com/gregorriegler/yak-n-stack
Git commands for yak-shaving and stacking PRs.
https://github.com/gregorriegler/yak-n-stack
git skill yak-shaving
Last synced: 27 days ago
JSON representation
Git commands for yak-shaving and stacking PRs.
- Host: GitHub
- URL: https://github.com/gregorriegler/yak-n-stack
- Owner: gregorriegler
- License: mit
- Created: 2026-04-06T20:21:17.000Z (3 months ago)
- Default Branch: main
- Last Pushed: 2026-05-10T20:01:51.000Z (about 2 months ago)
- Last Synced: 2026-05-10T20:13:12.077Z (about 2 months ago)
- Topics: git, skill, yak-shaving
- Language: Shell
- Homepage:
- Size: 93.8 KB
- Stars: 3
- Watchers: 0
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
# yak-n-stack
Git commands for yak-shaving and stacking PRs.
```
git yak pause to do something small without leaving your branch
git yak --branch insert a branch beneath your current work
git stack stack a new branch on top of the current one
git stack-pr push and create a PR for the bottom branch
git sync rebase the stack, cleaning up merged branches
git stack-tree print the branch stack
```
## Install
```bash
./install.sh # symlinks into ~/.local/bin (default)
./install.sh --copy # copies instead of symlinking
./install.sh --uninstall
```
---
## Yak: pause for something small
You're mid-flow on `feature` and notice a typo. You don't want to start
a new branch for a one-line fix.
```bash
git yak typo-fix
# fix the typo, commit it
git yak --done
```
`git yak ` stashes your in-progress work and leaves you on the
current branch. You make the fix and commit it directly. `git yak --done`
pops the stash back. Yak commits land on the current branch and ship with it.
Nest as deep as you want — each `--done` unwinds one level. Use
`git yak --abort` instead to throw the yak away (commits discarded,
stash dropped).
---
## Yak --branch: when the yak deserves its own PR
If the yak grows beyond a quick fix and you want it reviewed and
merged on its own:
Before:
```
main
└─ feature ← you are here, mid-work
```
```bash
git yak --branch refactor
```
After:
```
main
└─ refactor ← you are here, do the refactor
└─ feature ← moved on top, waiting
```
The script stashes uncommitted changes, creates `refactor` directly
beneath `feature`, rebases `feature` onto it, and drops you on
`refactor`. When done:
```bash
git yak --done
```
```
main
└─ refactor ← ready for review
└─ feature ← you are back here, stash restored
```
---
## Stack: keep going without waiting
You finished `part-1` and want to keep building on top.
Before:
```
main
└─ part-1 ← you are here, done but not merged
```
Motivation: `part-1` is in review. You don't want to wait — you want to
start `part-2` on top, so it's ready the moment `part-1` lands.
```bash
git stack part-2
```
After:
```
main
└─ part-1
└─ part-2 ← you are here
```
---
## Stack-pr: open a PR for the bottom branch
You're ready to send the bottom branch for review.
Before:
```
main
└─ part-1
└─ part-2 ← you are here
```
Motivation: only the bottom branch can be merged next. `stack-pr` finds
it and opens the PR against main — no checkout needed.
```bash
git stack-pr "Add feature part 1"
```
After: `part-1` is pushed and a PR is open against main. You stay on
`part-2` and keep working.
---
## Sync: a PR was merged
PR #1 (`part-1`) gets merged.
Before:
```
main
└─ part-1 ← merged
└─ part-2 ← you are here
```
Motivation: main moved forward. The stack needs to be rebased onto the
new main, and the merged branch cleaned up.
```bash
git sync
```
After:
```
main ← includes part-1
└─ part-2 ← rebased onto new main (you are here)
```
`git sync` detects that `part-1` was merged, deletes it, and rebases
everything above onto the new main. Works with squash merges,
rebase-and-merge, and regular merge commits.
---
## How it works
Branch relationships are stored in git config as `branch..stack-parent`.
`git stack-tree` prints the current stack:
```bash
$ git stack-tree
main
└─ refactor [2]
└─ feature [3] ←
```
The `[N]` is the commit count. The `←` marks the current branch.
All commands print the tree after completing, so you always know where
you are.
## Tests
```bash
./test.sh
```
## Notes
- `git stack-pr` requires the [GitHub CLI](https://cli.github.com/) (`gh`).
- The scripts assume your remote is named `origin`.
- If `init.defaultBranch` is not set, the scripts default to `main`:
```bash
git config init.defaultBranch develop # if your trunk is different
```
- If you rename or delete branches outside these commands, the
`stack-parent` config can go stale. Clean it up with
`git config --remove-section branch.`.