diff --git a/pages/common/git-psykorebase.md b/pages/common/git-psykorebase.md
new file mode 100644
index 000000000..5288ff8d9
--- /dev/null
+++ b/pages/common/git-psykorebase.md
@@ -0,0 +1,17 @@
+# git psykorebase
+
+> Rebase a branch on top of another using a merge commit and only one conflict handling.
+> Part of `git-extras`.
+> More information: <https://github.com/tj/git-extras/blob/master/Commands.md#git-psykorebase>.
+
+- Rebase the current branch on top of another using a merge commit and only one conflict handling:
+
+`git psykorebase {{upstream_branch}}`
+
+- Continue after conflicts have been handled:
+
+`git psykorebase --continue`
+
+- Specify the branch to rebase:
+
+`git psykorebase {{upstream_branch}} {{target_branch}}`