Skip to content
gitā
Everyday GitMerge and rebase

Merge and rebase, shown before they run

The operations that join or rewrite history are the ones worth a second look. In gitā each one opens a sheet that says what is about to happen.

Try it live

AgentWorking1 agent · 2 subagents
Branchfeature/checkout-v2↑2 not pushed
Pull request#214 Checkout v2: shipping and payment as separate steps#214 open · mira
Checks CIe3b7a10 · 2/3
Preview deployment Ready28 min ago · 2 commentsstorefront-git-feature-checkout-v2.northpier.dev
HistoryAuthorDateSHAStatus
Apply the saved address when the cart reloadsMira Okafor4m agoa91f3c2Not pushed +2
Split the payment step into its own routeMira Okafor9m ago5d20e7bNot pushed
Validate the shipping form on the serverMira Okafor32m agoe3b7a10 #214 Review requestedChecks running Preview ready
Round cart totals per line, not per orderTomás Vega47m ago0b6e2f4 Preview building
Checkout v2 skeleton behind a flagMira Okafor1h ago77c4d9e
Merge pull request #212 from feature/search-filtersJonas Lindqvist2h agoc8d41aaChecks passed Live
Persist filters in the URLPriya Nair3h ago4f1a6b3Checks passed Preview ready
Facet counts from the search indexPriya Nair4h ago9e0c5d7
Filter chips for size and colourPriya Nair5h ago2a7f9c1
Cache CDN images for a dayTomás Vega6h agob14e88dChecks passed Production ready
Merge pull request #209 from fix/webhook-retriesMira Okafor1d ago6c3d0f5Checks passed
Back off webhook retries exponentiallyJonas Lindqvist1d agod7e21b0
Record every webhook attemptJonas Lindqvist1d ago83af4c6
Release 2.4.0Tomás Vega2d agof02b7e9Checks passed Production ready
Lazy-load the product galleryPriya Nair2d ago1e9a3d4Checks passed
Merge pull request #205 from feature/gift-cardsJonas Lindqvist3d agoa5c70beChecks passed
Redeem gift cards at checkoutTomás Vega3d ago3d8b1f2
Gift card balance endpointTomás Vega3d ago70e4a9c
Gift card model and migrationsTomás Vega4d agoc2f5e61
Fix the flaky cart end-to-end testMira Okafor4d ago58b0d3aChecks passed
Upgrade to Next.js 16Jonas Lindqvist5d agoe91c7f8Checks failed
Tune the product page's largest paintPriya Nair5d ago0d4b6a2Checks passed
Merge pull request #198 from feature/wishlistMira Okafor6d ago7b3e9c5Checks passed
Wishlist pageJonas Lindqvist6d ago49a1d0e
Save for later buttonJonas Lindqvist1w agob6f82c3
Order status emailsTomás Vega1w ago2c7e5a9Checks passed
Cache category pagesPriya Nair1w ago9a41c0dChecks passed
Format prices per localeMira Okafor1w ago64d2b8eChecks passed
Cart drawerJonas Lindqvist2w ago31f7a6c
Initial storefrontMira Okafor2w agod08e5b4

Mira Okafor mira@northpier.example

4m ago · feature/checkout-v2

Apply the saved address when the cart reloads

The payment step read the address from the form state, so a reload lost it. Read it from the cart instead.

Written with Claude Code

No pull request, checks or deployments

Things to try

  1. Choose a branch in the Merge sheet.

  2. Switch between the three ways to merge.

  3. Right-click a commit in the history for Cherry-pick and Revert.

  • A sheet first

    Merge, rebase, cherry-pick, revert and reset each start with a sheet that names the branch or commit involved. Nothing changes until you confirm.

  • Three ways to merge

    Fast-forward when possible, always create a merge commit, or fast-forward only. Choose your usual one in Settings ▸ Git, where a small animation shows what each does.

  • Edit commits

    Edit Commits After This is an interactive rebase. Set each commit to pick, reword, edit, squash, fixup or drop, drag them into a new order, and gitā checks the plan before it runs.

  • Continue, skip, abort

    While an operation is under way, a bar over the history says how far it has got and how many files are unresolved, with Continue, Skip and Abort.

  • Conflict editor

    A conflicted file opens with the base, the current and the incoming version, and an editable result underneath. Take one side with a button or write the result yourself, then Save & Stage.

  • Reset, with the count

    Reset to a commit keeping staged changes, keeping your files, or discarding tracked changes. The sheet tells you how many files that affects, and a hard reset needs a tick first.

  • It checks again

    Before anything runs, gitā makes sure the repository is still on the branch and commit you looked at.

Keep exploring

All features

Download gitā

Free. macOS 14 or later, Apple silicon and Intel.