Skip to content

Commit

Permalink
Update default branch
Browse files Browse the repository at this point in the history
  • Loading branch information
jacebrowning committed Jul 30, 2020
1 parent 75cc862 commit 66aa386
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 49 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,7 @@
# 2.1 (beta)

- Added realtime display of script output.

# 2.0 (2020-04-13)

- **BREAKING**: Removed legacy `gdm` CLI entry point.
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -2,7 +2,7 @@

GitMan is a language-agnostic dependency manager using Git. It aims to serve as a submodules replacement and provides advanced options for managing versions of nested Git repositories.

![demo](https://raw.githubusercontent.com/jacebrowning/gitman/develop/docs/demo.gif)
![demo](https://raw.githubusercontent.com/jacebrowning/gitman/main/docs/demo.gif)

[![Unix Build Status](https://img.shields.io/travis/jacebrowning/gitman/master.svg?label=unix)](https://travis-ci.org/jacebrowning/gitman)
[![Windows Build Status](https://img.shields.io/appveyor/ci/jacebrowning/gitman/master.svg?label=window)](https://ci.appveyor.com/project/jacebrowning/gitman)
Expand Down Expand Up @@ -113,8 +113,8 @@ where `rev` can be:

- all or part of a commit SHA: `123def`
- a tag: `v1.0`
- a branch: `master`
- a `rev-parse` date: `'develop@{2015-06-18 10:30:59}'`
- a branch: `main`
- a `rev-parse` date: `'main@{2015-06-18 10:30:59}'`

Alternatively get the latest versions of certain dependencies or even dependency groups:

Expand Down
4 changes: 2 additions & 2 deletions docs/use-cases/branch-tracking.md
Expand Up @@ -11,7 +11,7 @@ location: vendor/gitman
sources:
- name: api
repo: https://github.com/example/api
rev: develop
rev: main
sources_locked:
- name: api
repo: https://github.com/example/api
Expand All @@ -35,7 +35,7 @@ tests

In the config file, the `sources_locked` section identifies that commit `b27308` of the API was last used to test this web app -- the last time `$ gitman update` was run.

The `sources` section identifies that the `develop` branch should be used when checking out a new version of the API.
The `sources` section identifies that the `main` branch should be used when checking out a new version of the API.

## Development Workflow

Expand Down
2 changes: 1 addition & 1 deletion docs/use-cases/build-integration.md
Expand Up @@ -30,7 +30,7 @@ location: vendor/gitman
sources:
- name: lib_foo
repo: https://github.com/example/lib_foo
rev: develop
rev: main
- name: lib_bar
repo: https://github.com/example/lib_bar
rev: master
Expand Down
2 changes: 1 addition & 1 deletion docs/use-cases/linked-features.md
Expand Up @@ -12,7 +12,7 @@ location: vendor/gitman
sources:
- name: api
repo: https://github.com/example/api
rev: develop
rev: main
sources_locked:
- name: api
repo: https://github.com/example/api
Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Expand Up @@ -3,7 +3,7 @@ site_description: A language-agnostic dependency manager using Git.
site_author: Jace Browning

repo_url: https://github.com/jacebrowning/gitman
edit_uri: https://github.com/jacebrowning/gitman/edit/develop/docs
edit_uri: https://github.com/jacebrowning/gitman/edit/main/docs

theme: readthedocs

Expand Down
80 changes: 40 additions & 40 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
@@ -1,7 +1,7 @@
[tool.poetry]

name = "gitman"
version = "2.0"
version = "2.1b1"
description = "A language-agnostic dependency manager using Git."

license = "MIT"
Expand Down

0 comments on commit 66aa386

Please sign in to comment.