From fde67e72045a47441b9a875a7804f89db0453b45 Mon Sep 17 00:00:00 2001 From: Sebastiaan Speck <12570668+sebastiaanspeck@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:22:43 +0200 Subject: [PATCH] git-psykorebase: add page (#10994) --- pages/common/git-psykorebase.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 pages/common/git-psykorebase.md diff --git a/pages/common/git-psykorebase.md b/pages/common/git-psykorebase.md new file mode 100644 index 0000000000..5288ff8d9c --- /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: . + +- 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}}`