Retcon (original) (raw)

Drag, drop, done.

Rewrite Git history with a single drag-and-drop. Undo anything with ⌘Z. All speed, no bumps.

Download Retcon 1.6

14-day trial • Requires macOS 14.3+

To reword in Retcon:

  1. Select the commit to reword. Its details are displayed.
  2. Enter the new message.

All done. Your files and stage have been left intact.

To reword in a conventional GUI:

  1. If there are uncommitted changes, click Stash.
    A window opens. Choose OK.
  2. Right-click the commit to reword, and choose Reword.
  3. A window opens with the commit’s current message. Enter the new message, and confirm.
  4. If you stashed changes in step 1, click Restore Apply to restore them.
    A window opens. Choose OK.

All done. Your uncommitted changes are restored, but the stage may have been reset.

To reword through the Git CLI:

  1. If there are uncommitted changes, run git reset, then git stash.
    This unstages all changes, and sets them aside.
  2. Run git log. The current branch's history is displayed.
  3. Find the commit to reword in the list. Copy its hash, and exit.
  4. Run git rebase -i COPIED_HASH^ to start an interactive rebase.
  5. An editor opens with a commit list. Change the first commit’s action to r. Save and exit.
  6. A new editor opens with the commit’s current message. Enter the new message. Save and exit.
  7. If you stashed changes in step 1, run git stash pop to restore them.

All done. Your uncommitted changes are restored, but the stage has been reset.

How to undo in Retcon How to undo through the Git CLI
Undo creating a commit
Created a commit Press ⌘Z. Run git reset --soft HEAD~.
Undo deleting a commit
Deleted a commit Press ⌘Z. Run git reflog to display the list of recent head commits. Copy the first one’s hash. Run git reset, then git stash to set changes aside. Run git reset --hard COPIED_HASH to revert to the previous head commit. Run git stash pop to restore stashed changes.
Undo rebasing a branch (reword, move, delete, fixup)
Rebased a branch (reword, move, delete, fixup) Press ⌘Z. See above.
Undo pulling from a remote
Pulled from a remote Press ⌘Z. See above.
Undo pushing to a remote
Pushed to a remote Press ⌘Z. Find the output of the git push command to undo. On the last line of the output, copy the first commit hash. Run git push --force-with-lease COPIED_HASH. If the remote branch was changed since your push, the new changes might be silently overwritten.
Undo creating a branch
Created a branch Press ⌘Z. Run git branch -d BRANCH_NAME.
Undo deleting a branch
Deleted a branch Press ⌘Z. Find the output of the git branch -d command to undo. Copy the commit hash. Run git branch BRANCH_NAME COPIED_HASH.
Undo staging a file
Staged a file Press ⌘Z. To unstage the whole file, run git restore --staged FILE_PATH. To unstage specific hunks, instead run git reset -p FILE_PATH, and manually select the hunks.
Undo unstaging a file
Unstaged a file Press ⌘Z. To stage the whole file, run git add FILE_PATH. To stage specific hunks, instead run git add -p FILE_PATH, and manually select the hunks. If some of the staged changes were not in the working directory, they cannot be recovered.
Undo confirming a conflict resolution
Confirmed a conflict resolution Press ⌘Z. Abort the current rebase by running git rebase --abort. Restart the rebase from scratch. Recreate the same rebase list, perform the same message edits, and redo every conflict resolution yourself.

Retcon doesn’t stop at telling you that a file has conflicts: it actually shows its detailed diff.

Get full context around the pausing commit: see the successfully applied parents, and what commits will be inserted next, including any mutations.

Don’t wait to find out whether your changes cause conflicts. Each manipulation is applied instantly, giving you full visibility at every step.

Made a mistake during a rebase? Just undo one operation at a time—no need to start over from scratch. Go back just enough, fix the mistake, and resume from there.

When in doubt, glance at the contextual guide: a concise, context-aware summary of your next steps to resolution.

You can manipulate the history at any time; even when there’s a conflict waiting. And sometimes, just reordering commits is enough to resolve a conflict.

Browser-like head history.

Use familiar shortcuts to quickly check out recent branches.

Pause badge in Dock.

Stay focused on the current rebase even through distractions.

Built-in test sandbox.

Freely experiment with Git in a dedicated repository that resets automatically.

Parent pull+rebase.

In a single click, update the parent branch, and rebase on it.

Ready to see for yourself?

Jump into the built-in test sandbox, and see what makes Retcon unique.