弃用 gitm merge指令

saqqdy · Nov 28, 2023 · 8fd31a9 · 8fd31a9
1 parent 877876a
commit 8fd31a9
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 264 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -94,7 +94,6 @@ yarn global add gitmars
 - 远程 review 代码 [gitm review](http://www.saqqdy.com/gitmars/api/#gitm-review)
 - 清理合并过的功能分支 [gitm cleanbranch](http://www.saqqdy.com/gitmars/api/#gitm-cleanbranch)
 - 简化 git 的 cherry-pick 操作 [gitm copy](http://www.saqqdy.com/gitmars/api/#gitm-copy)
-- 合并代码 [gitm merge](http://www.saqqdy.com/gitmars/api/#gitm-merge)
 - 继续未完成的操作 [gitm continue](http://www.saqqdy.com/gitmars/api/#gitm-continue)
 - 撤销提交 [gitm revert](http://www.saqqdy.com/gitmars/api/#gitm-revert)
 - 撤回某次提交记录或者撤回谋条分支的合并记录 [gitm undo](http://www.saqqdy.com/gitmars/api/#gitm-undo)
@@ -116,7 +115,6 @@ yarn global add gitmars
 - 发布分支 [gitm admin publish](http://www.saqqdy.com/gitmars/api/#gitm-admin-publish)
 - 更新主干分支代码 [gitm admin update](http://www.saqqdy.com/gitmars/api/#gitm-admin-update)
 - 清理分支 [gitm admin clean](http://www.saqqdy.com/gitmars/api/#gitm-admin-clean)
-- 查看版本号 [gitm version](http://www.saqqdy.com/gitmars/api/#gitm-version)
 
 ## 智能导航
 

diff --git a/packages/docs/.vitepress/config.ts b/packages/docs/.vitepress/config.ts
@@ -68,10 +68,6 @@ const sidebar = {
 			text: '效率',
 			collapsable: false,
 			items: [
-				{
-					text: 'merge',
-					link: '/example/#merge'
-				},
 				{
 					text: 'copy',
 					link: '/example/#copy'
@@ -142,10 +138,6 @@ const sidebar = {
 			text: '效率',
 			collapsable: false,
 			items: [
-				{
-					text: 'gitm merge',
-					link: '/api/#gitm-merge'
-				},
 				{
 					text: 'gitm copy',
 					link: '/api/#gitm-copy'

diff --git a/packages/docs/api/index.md b/packages/docs/api/index.md
@@ -400,33 +400,6 @@ gitm ct -l
 
 ## 效率
 
-### gitm merge
-
-#### 短指令：gitm mg
-
-合并分支，类似 git merge 功能
-
-- 使用：`gitm merge <name>`
-- 参数：
-
-<div class="table-prop">
-
-| 参数 | 说明       | 类型     | 可选值 | 必填 | 默认 |
-| ---- | ---------- | -------- | ------ | ---- | ---- |
-| name | merge 来源 | `String` | -      | 是   | -    |
-
-</div>
-
-- 示例：
-
-合并 20001 分支到当前分支
-
-```shell
-gitm merge 20001
-# or
-gitm mg 20001
-```
-
 ### gitm copy
 
 #### 短指令：gitm cp

diff --git a/packages/docs/example/index.md b/packages/docs/example/index.md
@@ -487,27 +487,6 @@ bugfix 分支基于 bug 创建，所以发布的时候会吧 bug 合并到 maste
 
 ## 效率
 
-### merge
-
-#### 合并分支（--no-ff）
-
-- 使用：`gitm merge feature/10088`
-- 参考：[gitm merge](../api/#gitm-merge)
-
-::: tip 其他写法
-
-- 使用简写 `gitm mg feature/10088`
-
-:::
-
-- 结果：
-
-```shell
-    ➜  gitmars git:(support/graphql) gitm merge feature/10088
-    ...
-    ➜  gitmars git:(support/graphql)
-```
-
 ### copy
 
 #### 复制 commit 记录

diff --git a/packages/docs/guide/index.md b/packages/docs/guide/index.md
@@ -74,7 +74,6 @@ title: guide
 - 远程 review 代码 [gitm review](../api/#gitm-review)
 - 清理合并过的功能分支 [gitm cleanbranch](../api/#gitm-cleanbranch)
 - 简化 git 的 cherry-pick 操作 [gitm copy](../api/#gitm-copy)
-- 合并代码 [gitm merge](../api/#gitm-merge)
 - 继续未完成的操作 [gitm continue](../api/#gitm-continue)
 - 撤销提交 [gitm revert](../api/#gitm-revert)
 - 撤回某次提交记录或者撤回谋条分支的合并记录 [gitm undo](../api/#gitm-undo)
@@ -96,7 +95,6 @@ title: guide
 - 发布分支 [gitm admin publish](../api/#gitm-admin-publish)
 - 更新主干分支代码 [gitm admin update](../api/#gitm-admin-update)
 - 清理分支 [gitm admin clean](../api/#gitm-admin-clean)
-- 查看版本号 [gitm version](../api/#gitm-version)
 
 ## 为什么不用 GitFlow
 

diff --git a/packages/gitmars/README.md b/packages/gitmars/README.md
@@ -94,7 +94,6 @@ yarn global add gitmars
 - 远程 review 代码 [gitm review](http://www.saqqdy.com/gitmars/api/#gitm-review)
 - 清理合并过的功能分支 [gitm cleanbranch](http://www.saqqdy.com/gitmars/api/#gitm-cleanbranch)
 - 简化 git 的 cherry-pick 操作 [gitm copy](http://www.saqqdy.com/gitmars/api/#gitm-copy)
-- 合并代码 [gitm merge](http://www.saqqdy.com/gitmars/api/#gitm-merge)
 - 继续未完成的操作 [gitm continue](http://www.saqqdy.com/gitmars/api/#gitm-continue)
 - 撤销提交 [gitm revert](http://www.saqqdy.com/gitmars/api/#gitm-revert)
 - 撤回某次提交记录或者撤回谋条分支的合并记录 [gitm undo](http://www.saqqdy.com/gitmars/api/#gitm-undo)
@@ -116,7 +115,6 @@ yarn global add gitmars
 - 发布分支 [gitm admin publish](http://www.saqqdy.com/gitmars/api/#gitm-admin-publish)
 - 更新主干分支代码 [gitm admin update](http://www.saqqdy.com/gitmars/api/#gitm-admin-update)
 - 清理分支 [gitm admin clean](http://www.saqqdy.com/gitmars/api/#gitm-admin-clean)
-- 查看版本号 [gitm version](http://www.saqqdy.com/gitmars/api/#gitm-version)
 
 ## 智能导航
 

diff --git a/packages/gitmars/src/gitm-merge.ts b/packages/gitmars/src/gitm-merge.ts
diff --git a/packages/gitmars/src/gitm.ts b/packages/gitmars/src/gitm.ts
@@ -54,8 +54,6 @@ program
 	.alias('clb')
 	.command('copy <id>', t("Simplify git's cherry-pick operation"))
 	.alias('cp')
-	.command('merge <name>', t('Merge code'))
-	.alias('mg')
 	.command('continue', t('Continue unfinished operations'))
 	.alias('ct')
 	.command('revert', t('Undo commit'))
@@ -123,8 +121,6 @@ program.on('command:*', function (types: string[], opts: string[]) {
 		'clb',
 		'copy',
 		'cp',
-		'merge',
-		'mg',
 		'continue',
 		'ct',
 		'revert',