Merge branch 'dev'

saqqdy · saqqdy · commit 83de7d246e08 · 2020-02-24T02:03:28.000+08:00
diff --git a/README.md b/README.md
@@ -34,8 +34,8 @@ gitm start bugfix 20001
 
 任务阶段提测，这部操作把分支代码合并到dev和bug分支
 ```
-# 形式：gitm comb <type> <name>
-gitm comb bugfix 20001
+# 形式：gitm combine <type> <name>
+gitm combine bugfix 20001
 ```
 
 任务完成，合并并删除分支，这个操作会把20001这个分支代码合并到bug分支并删除20001分支
diff --git a/bin/gitm-combine.js b/bin/gitm-combine.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "gitmars",
 	"description": "git tool for newbees",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"main": "bin/gitm.js",
 	"scripts": {
 		"start": "react-scripts start"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gitmars",`
`3`	`3`	`"description": "git tool for newbees",`
`4`		`- "version": "1.0.2",`
	`4`	`+ "version": "1.0.3",`
`5`	`5`	`"main": "bin/gitm.js",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"start": "react-scripts start"`