Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
saqqdy committed Jul 8, 2021
2 parents 96ad94a + 1046794 commit db6ca01
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
> 1. gitmars 每一个子命令都带了 help 功能,可输入 gitm [command] --help 获取对应指令的帮助
> 2. <type>意思是 type 必传;[type]意思是 type 选填;[-a --app [app]]其中-a 是--app 的简写,后面[app]指的是-a 后面的传值
# **完整文档请查阅: [Gitmars 使用文档](http://docs.saqqdy.com/gitmars/api/)**
# **完整文档请查阅: [Gitmars 使用文档](http://www.saqqdy.com/gitmars/api/)**

> 更新日志请查阅:[Gitmars 更新日志](https://docs.saqqdy.com/gitmars/changelog.html)
> 更新日志请查阅:[Gitmars 更新日志](http://www.saqqdy.com/gitmars/changelog.html)
# 安装

Expand All @@ -44,8 +44,8 @@ npm install -g gitmars@lite

# 使用

> 开始: [快速上手](https://docs.saqqdy.com/gitmars/guide/getting-start.html)
> gitmars配置参数:[参数说明](https://docs.saqqdy.com/gitmars/guide/basic-config.html)
> 开始: [快速上手](http://www.saqqdy.com/gitmars/guide/getting-start.html)
> gitmars配置参数:[参数说明](http://www.saqqdy.com/gitmars/guide/basic-config.html)
```shell
# 初始化
Expand Down
2 changes: 1 addition & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

# 2021.03.27 v2.0.2更新日志
1. 新增gitm ui指令,启动UI界面
2. 新增无git权限自动调起合并请求的功能,需要配置api、gitHost、gitID,具体配置查阅:[Gitmars基本配置](https://docs.saqqdy.com/gitmars/guide/basic-config.html)
2. 新增无git权限自动调起合并请求的功能,需要配置api、gitHost、gitID,具体配置查阅:[Gitmars基本配置](http://www.saqqdy.com/gitmars/guide/basic-config.html)
3. 升级checkBranch、searchBranchs、getCurrent方法,执行更加高效
4. 取消强制配置api
5. git config和git init加入对api/gitHost/gitID参数设置的支持
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@
"bugs": {
"url": "https://github.com/saqqdy/gitmars/issues"
},
"homepage": "https://docs.saqqdy.com/gitmars"
"homepage": "https://www.saqqdy.com/gitmars"
}

1 comment on commit db6ca01

@vercel
Copy link

@vercel vercel bot commented on db6ca01 Jul 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.