Skip to content

Commit ad3f3e2

Browse files
authored
Merge pull request #8 from github/skarim/docs
Docs site for stacks
2 parents c9b61f2 + b1eb040 commit ad3f3e2

37 files changed

Lines changed: 7907 additions & 8 deletions

.github/workflows/docs.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Docs
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- main
8+
paths:
9+
- 'docs/**'
10+
- '.github/workflows/docs.yml'
11+
12+
permissions:
13+
contents: read
14+
pages: write
15+
id-token: write
16+
17+
concurrency:
18+
group: "pages-${{ github.ref }}"
19+
cancel-in-progress: false
20+
21+
jobs:
22+
build:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Checkout repository
26+
uses: actions/checkout@v4
27+
28+
- name: Setup Node.js
29+
uses: actions/setup-node@v4
30+
with:
31+
node-version: '24'
32+
cache: 'npm'
33+
cache-dependency-path: 'docs/package-lock.json'
34+
35+
- name: Install dependencies
36+
working-directory: ./docs
37+
run: npm ci --legacy-peer-deps
38+
39+
- name: Build documentation
40+
working-directory: ./docs
41+
run: npm run build
42+
43+
- name: Upload build artifacts
44+
if: github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch'
45+
uses: actions/upload-pages-artifact@v3
46+
with:
47+
path: ./docs/dist
48+
49+
deploy:
50+
if: github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch'
51+
environment:
52+
name: github-pages
53+
url: ${{ steps.deployment.outputs.page_url }}
54+
runs-on: ubuntu-latest
55+
needs: build
56+
steps:
57+
- name: Deploy to GitHub Pages
58+
id: deployment
59+
uses: actions/deploy-pages@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: release
1+
name: Release
22

33
on:
44
push:

CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This repository is maintained by:
2+
* @skarim

CODE_OF_CONDUCT.md

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, gender identity and expression, level of experience,
9+
nationality, personal appearance, race, religion, or sexual identity and
10+
orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at <opensource@github.com>. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at [http://contributor-covenant.org/version/1/4][version]
72+
73+
[homepage]: http://contributor-covenant.org
74+
[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
## Contributing
2+
3+
[fork]: https://github.com/github/gh-stack/fork
4+
[pr]: https://github.com/github/gh-stack/compare
5+
6+
Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great.
7+
8+
Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE).
9+
10+
Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
11+
12+
## Prerequisites
13+
14+
- [Go](https://go.dev/doc/install) (version specified in `go.mod`)
15+
- [GitHub CLI](https://cli.github.com/) (`gh`) v2.0+
16+
17+
## Local setup
18+
19+
```sh
20+
# Clone the repository (or your fork)
21+
git clone https://github.com/github/gh-stack.git
22+
cd gh-stack
23+
24+
# Download dependencies
25+
go mod download
26+
```
27+
28+
## Build
29+
30+
```sh
31+
go build ./...
32+
```
33+
34+
This produces a `gh-stack` binary in the current directory.
35+
36+
## Test
37+
38+
```sh
39+
# Run all tests with race detection
40+
go test -race -count=1 ./...
41+
```
42+
43+
## Vet
44+
45+
```sh
46+
go vet ./...
47+
```
48+
49+
## Install locally as a `gh` extension
50+
51+
To test your local build as a `gh` CLI extension:
52+
53+
```sh
54+
# Build the binary
55+
go build -o gh-stack .
56+
57+
# Remove any existing installation
58+
gh extension remove stack
59+
60+
# Install from the local directory
61+
gh extension install .
62+
```
63+
64+
You can now run `gh stack` and it will use your locally built version.
65+
66+
## Docs site
67+
68+
The documentation site lives in `docs/` and uses [Astro](https://astro.build/) + [Starlight](https://starlight.astro.build/).
69+
70+
```sh
71+
cd docs
72+
npm install
73+
npm run dev # Start dev server at localhost:4321
74+
npm run build # Production build to docs/dist/
75+
```
76+
77+
## Submitting a pull request
78+
79+
1. [Fork][fork] and clone the repository
80+
1. Create a new branch: `git checkout -b my-branch-name`
81+
1. Make your change and add tests
82+
1. Make sure tests pass: `go test -race -count=1 ./...`
83+
1. Make sure vet passes: `go vet ./...`
84+
1. Push to your fork and [submit a pull request][pr]
85+
86+
Here are a few things you can do that will increase the likelihood of your pull request being accepted:
87+
88+
- Write tests.
89+
- Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
90+
- Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
91+
92+
## Resources
93+
94+
- [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)
95+
- [Using Pull Requests](https://help.github.com/articles/about-pull-requests/)
96+
- [GitHub Help](https://help.github.com)

README.md

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ npx skills add github/gh-stack
2323
## Quick start
2424

2525
```sh
26-
# Start a new stack from the default branch
26+
# Start a new stack (creates and checks out the first branch)
2727
gh stack init
2828

29-
# Create the first branch and start working
30-
gh stack add auth-layer
31-
# ... make commits ...
29+
# ... make commits on the first branch ...
3230

3331
# Add another branch on top
3432
gh stack add api-endpoints
@@ -224,7 +222,7 @@ gh stack rebase --upstack
224222
# After resolving a conflict
225223
gh stack rebase --continue
226224

227-
# Give up and restore everything
225+
# Abort rebase and restore everything
228226
gh stack rebase --abort
229227
```
230228

@@ -378,12 +376,42 @@ gh stack feedback
378376
gh stack feedback "Support for reordering branches"
379377
```
380378

379+
### `gh stack alias`
380+
381+
Create a short command alias so you can type less.
382+
383+
```
384+
gh stack alias [name] [flags]
385+
```
386+
387+
Installs a small wrapper script into `~/.local/bin/` that forwards all arguments to `gh stack`. The default alias name is `gs`, but you can choose any name by passing it as an argument. After setup, you can run `gs push` instead of `gh stack push`.
388+
389+
On Windows, automatic alias creation is not supported — the command prints manual instructions for creating a batch file or PowerShell function.
390+
391+
| Flag | Description |
392+
|------|-------------|
393+
| `--remove` | Remove a previously created alias |
394+
395+
**Examples:**
396+
397+
```sh
398+
# Create the default alias (gs)
399+
gh stack alias
400+
# → now "gs push", "gs view", etc. all work
401+
402+
# Create a custom alias
403+
gh stack alias gst
404+
405+
# Remove an alias
406+
gh stack alias --remove
407+
gh stack alias gst --remove
408+
```
409+
381410
## Typical workflow
382411

383412
```sh
384-
# 1. Start a stack
413+
# 1. Start a stack (creates and checks out the first branch)
385414
gh stack init
386-
gh stack add auth-middleware
387415

388416
# 2. Work on the first layer
389417
# ... write code, make commits ...
@@ -461,3 +489,17 @@ Compared to the typical workflow, there's no need to name branches, run `git add
461489
| 6 | Disambiguation required (branch belongs to multiple stacks) |
462490
| 7 | Rebase already in progress |
463491
| 8 | Stack is locked by another process |
492+
493+
## License
494+
495+
This project is licensed under the terms of the MIT open source license. Please refer to the [LICENSE](LICENSE) file for the full terms.
496+
497+
## Maintainers
498+
499+
See [CODEOWNERS](CODEOWNERS)
500+
501+
## Support
502+
503+
See [SUPPORT.md](SUPPORT.md)
504+
505+
Please note that the Stacked PRs feature is currently in private preview and **gh-stack** will not work without that feature enabled.

SECURITY.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Thanks for helping make GitHub safe for everyone.
2+
3+
# Security
4+
5+
GitHub takes the security of our software products and services seriously, including all of the open source code repositories managed through our GitHub organizations, such as [GitHub](https://github.com/GitHub).
6+
7+
Even though [open source repositories are outside of the scope of our bug bounty program](https://bounty.github.com/index.html#scope) and therefore not eligible for bounty rewards, we will ensure that your finding gets passed along to the appropriate maintainers for remediation.
8+
9+
## Reporting Security Issues
10+
11+
If you believe you have found a security vulnerability in any GitHub-owned repository, please report it to us through coordinated disclosure.
12+
13+
**Please do not report security vulnerabilities through public GitHub issues, discussions, or pull requests.**
14+
15+
Instead, please send an email to opensource-security[@]github.com.
16+
17+
Please include as much of the information listed below as you can to help us better understand and resolve the issue:
18+
19+
* The type of issue (e.g., buffer overflow, SQL injection, or cross-site scripting)
20+
* Full paths of source file(s) related to the manifestation of the issue
21+
* The location of the affected source code (tag/branch/commit or direct URL)
22+
* Any special configuration required to reproduce the issue
23+
* Step-by-step instructions to reproduce the issue
24+
* Proof-of-concept or exploit code (if possible)
25+
* Impact of the issue, including how an attacker might exploit the issue
26+
27+
This information will help us triage your report more quickly.
28+
29+
## Policy
30+
31+
See [GitHub's Safe Harbor Policy](https://docs.github.com/en/site-policy/security-policies/github-bug-bounty-program-legal-safe-harbor#1-safe-harbor-terms)

SUPPORT.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Support
2+
3+
## How to file issues and get help
4+
5+
This project uses GitHub issues to track bugs and feature requests. Please search the existing issues before filing new issues to avoid duplicates. For new issues, file your bug or feature request as a new issue.
6+
7+
For help or questions about using this project, please use GitHub Discussions. Add a comment to an existing post or create a new discussion post.
8+
9+
**gh-stack** is under active development and maintained by GitHub staff. We will do our best to respond to support, feature requests, and community questions in a timely manner.
10+
11+
Please note that the Stacked PRs feature is currently in private preview and **gh-stack** will not work without that feature enabled.
12+
13+
## GitHub Support Policy
14+
15+
Support for this project is limited to the resources listed above.

docs/.gitignore

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# build output
2+
dist/
3+
4+
# generated types
5+
.astro/
6+
7+
# dependencies
8+
node_modules/
9+
10+
# logs
11+
npm-debug.log*
12+
yarn-debug.log*
13+
yarn-error.log*
14+
pnpm-debug.log*
15+
16+
# environment variables
17+
.env
18+
.env.local
19+
.env.production
20+
21+
# macOS-specific files
22+
.DS_Store

0 commit comments

Comments
 (0)