瀏覽代碼

git-psykorebase: add page (#10994)

Sebastiaan Speck 1 年之前
父節點
當前提交
fde67e7204
共有 1 個文件被更改,包括 17 次插入0 次删除
  1. 17 0
      pages/common/git-psykorebase.md

+ 17 - 0
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}}`