Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@saqqdy
saqqdy committed Feb 20, 2021
2 parents bfe77ba + 7873667 commit 5741bd0
Show file tree
Hide file tree
Showing 81 changed files with 3,419 additions and 3,352 deletions.
6 changes: 3 additions & 3 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { simple: config } = require('eslint-config-sets')
module.exports = Object.assign(config, {
rules: {
semi: [2, 'never']
}
rules: {
semi: [2, 'never']
}
})
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

一个定制化的 git 工作流操作工具

# **完整文档请查阅： [Gitmars API文档](http://docs.saqqdy.com/gitmars/api/)**
# **完整文档请查阅： [Gitmars API 文档](http://docs.saqqdy.com/gitmars/api/)**

# gitmars 工作流：

Expand Down Expand Up @@ -73,5 +73,5 @@ gitm copy -h

- 使用：`gitm go`
- 演示：

> ![gitmars-go.gif](https://raw.githubusercontent.com/saqqdy/gitmars/master/lib/img/gitmars-go.gif)
310 changes: 155 additions & 155 deletions bin/conf/admin.js
View file
Original file line number Diff line number Diff line change
@@ -1,158 +1,158 @@
;(function (root) {
const cmdConfig = {
command: 'admin',
short: null,
create: {
command: 'create',
short: null,
args: [
{
required: true,
name: 'type',
variadic: false,
description: '分支类型'
}
],
options: []
},
publish: {
command: 'publish',
short: null,
args: [
{
required: true,
name: 'type',
variadic: false,
description: '分支类型'
}
],
options: [
{
flags: '-c, --combine',
required: false,
optional: false,
variadic: false,
mandatory: false,
short: '-c',
long: '--combine',
negate: false,
description: '是否把release代码同步到bug',
defaultValue: false,
recommend: false
},
{
flags: '--use-rebase',
required: false,
optional: false,
variadic: false,
mandatory: false,
long: '--use-rebase',
negate: false,
description: '是否使用rebase方式更新，默认merge',
defaultValue: false,
recommend: false
},
{
flags: '-p, --prod',
required: false,
optional: false,
variadic: false,
mandatory: false,
short: '-p',
long: '--prod',
negate: false,
description: '发布bug分支时，是否合并bug到master',
defaultValue: false,
recommend: false
},
{
flags: '-b, --build [build]',
required: false,
optional: true,
variadic: false,
mandatory: false,
short: '-b',
long: '--build',
negate: false,
description: '构建应用',
recommend: true
},
{
flags: '--postmsg',
required: false,
optional: false,
variadic: false,
mandatory: false,
long: '--postmsg',
negate: false,
description: '发送消息',
defaultValue: false,
recommend: false
}
]
},
update: {
command: 'update',
short: null,
args: [{ required: true, name: 'type', variadic: false, description: '分支类型' }],
options: [
{
flags: '--use-rebase',
required: false,
optional: false,
variadic: false,
mandatory: false,
long: '--use-rebase',
negate: false,
description: '是否使用rebase方式更新，默认merge',
defaultValue: false,
recommend: false
},
{
flags: '-m, --mode [mode]',
required: false,
optional: true,
variadic: false,
mandatory: false,
short: '-m',
long: '--mode',
negate: false,
description: '出现冲突时，保留传入代码还是保留当前代码；1=采用当前 2=采用传入；默认为 0=手动处理。本参数不可与--use-rebase同时使用',
defaultValue: 0,
recommend: false
},
{
flags: '--postmsg',
required: false,
optional: false,
variadic: false,
mandatory: false,
long: '--postmsg',
negate: false,
description: '发送消息',
defaultValue: false,
recommend: false
}
]
},
clean: {
command: 'clean',
short: null,
args: [
{
required: true,
name: 'type',
variadic: false,
description: '分支类型'
}
],
options: []
}
}
const cmdConfig = {
command: 'admin',
short: null,
create: {
command: 'create',
short: null,
args: [
{
required: true,
name: 'type',
variadic: false,
description: '分支类型'
}
],
options: []
},
publish: {
command: 'publish',
short: null,
args: [
{
required: true,
name: 'type',
variadic: false,
description: '分支类型'
}
],
options: [
{
flags: '-c, --combine',
required: false,
optional: false,
variadic: false,
mandatory: false,
short: '-c',
long: '--combine',
negate: false,
description: '是否把release代码同步到bug',
defaultValue: false,
recommend: false
},
{
flags: '--use-rebase',
required: false,
optional: false,
variadic: false,
mandatory: false,
long: '--use-rebase',
negate: false,
description: '是否使用rebase方式更新，默认merge',
defaultValue: false,
recommend: false
},
{
flags: '-p, --prod',
required: false,
optional: false,
variadic: false,
mandatory: false,
short: '-p',
long: '--prod',
negate: false,
description: '发布bug分支时，是否合并bug到master',
defaultValue: false,
recommend: false
},
{
flags: '-b, --build [build]',
required: false,
optional: true,
variadic: false,
mandatory: false,
short: '-b',
long: '--build',
negate: false,
description: '构建应用',
recommend: true
},
{
flags: '--postmsg',
required: false,
optional: false,
variadic: false,
mandatory: false,
long: '--postmsg',
negate: false,
description: '发送消息',
defaultValue: false,
recommend: false
}
]
},
update: {
command: 'update',
short: null,
args: [{ required: true, name: 'type', variadic: false, description: '分支类型' }],
options: [
{
flags: '--use-rebase',
required: false,
optional: false,
variadic: false,
mandatory: false,
long: '--use-rebase',
negate: false,
description: '是否使用rebase方式更新，默认merge',
defaultValue: false,
recommend: false
},
{
flags: '-m, --mode [mode]',
required: false,
optional: true,
variadic: false,
mandatory: false,
short: '-m',
long: '--mode',
negate: false,
description: '出现冲突时，保留传入代码还是保留当前代码；1=采用当前 2=采用传入；默认为 0=手动处理。本参数不可与--use-rebase同时使用',
defaultValue: 0,
recommend: false
},
{
flags: '--postmsg',
required: false,
optional: false,
variadic: false,
mandatory: false,
long: '--postmsg',
negate: false,
description: '发送消息',
defaultValue: false,
recommend: false
}
]
},
clean: {
command: 'clean',
short: null,
args: [
{
required: true,
name: 'type',
variadic: false,
description: '分支类型'
}
],
options: []
}
}

/* istanbul ignore next */
if (typeof exports === 'object' && typeof module === 'object') module.exports = cmdConfig
// else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
else root['cmdConfig'] = cmdConfig
/* istanbul ignore next */
if (typeof exports === 'object' && typeof module === 'object') module.exports = cmdConfig
// else if (typeof define === 'function' && define.amd) define(['cmdConfig'], () => cmdConfig)
else if (typeof exports === 'object') exports['cmdConfig'] = cmdConfig
else root['cmdConfig'] = cmdConfig
})(typeof window !== 'undefined' ? window : global)
Loading

0 comments on commit 5741bd0

Please sign in to comment.