GIT-PSYKOREBASE(1)

📦
version 7.5.0 · 7 versions
, in ubuntu stonking

💖 GIT-PSYKOREBASE(1) 💖

okay bestie, so this is a page from the Git Extras manual set, and it's called git-psykorebase — the rebase that brings a merge commit to the party instead of ghosting it. 🎀

✨ NAME ✨

git-psykorebase — rebase a branch, but make it a merge commit moment 💅

🌸 SYNOPSIS 🌸

git-psykorebase <target_branch> [<feature_branch>] [--no-ff]
git-psykorebase --continue

🦋 DESCRIPTION 🦋

So basically: you take the feature_branch and you plop it on top of the target_branch. Iconic. Classic. Exactly what you'd expect.

But here's the cute part — if you don't say which feature_branch you mean, it just goes with the one you're standing on right now. Your current branch. Main character energy, no questions asked. 👑

💅 OPTIONS 💅

  • --no-ff — forces the commit message through even when there's literally zero conflict happening. Like, "bestie I know it went smooth but I still want a commit, okay?" 💖
  • --continue — picks the rebase back up after you've dealt with the conflicts. the way that you just say "carry on" and it carries on 😭

🌈 EXAMPLES 🌈

Rebasing your current branch on top of master, with the forced-commit-message vibe:

$ git psykorebase master --no-ff

Handling them conflicts (yes you, go add the file, you got this):

$ git add README.md

And then, continuing the rebase because we are not abandoning the mission:

$ git psykorebase --continue

slay ✨

🫶 AUTHOR 🫶

Written by Rémy Hubscher <hubscher.remy@gmail.com> — absolute legend.

Based on Benoît Bryon <benoit@marmelune.net> implementation in Python. so it's giving heritage, it's giving lineage 🧚

💀 REPORTING BUGS 💀

Found something cursed? Tell the people:

<https://github.com/tj/git-extras/issues>

fr fr, bugs go to the issue tracker, not into the group chat. 🙈

🔥 SEE ALSO 🔥

okay that's the whole thing, you're officially a psykorebase girlie now 💜

this lil page? it's from Git Extras, dated May 2026, and it lives in the same manual family as all the other git-psykorebase entries — go forth and rebase responsibly, bestie 💖🌸

📦 where this page comes from