Skip to content
Merged

typos #117

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content/docs/development/debugging.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ In this directory, there should be rolling daily logs:

## Data Files

GitButler also keeps it's own data about each of your projects. The virtual branch metadata, your user config stuff, a log of changes in each file, etc. If you want to inspect what GitButler is doing or debug or reset everything, you can go to our data directory.
GitButler also keeps its own data about each of your projects. The virtual branch metadata, your user config stuff, a log of changes in each file, etc. If you want to inspect what GitButler is doing or debug or reset everything, you can go to our data directory.

<Tabs groupId="platform" items={['macOS', 'Windows', 'Linux']} persist>
<Tab value="macOS">
Expand Down
2 changes: 1 addition & 1 deletion content/docs/features/agents-tab.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ We will do some cool things as it runs, however.

### One Branch Per Session

In GitButler, each branch is also an agent session with it's own context. You can see each branch in the Agents Tab sidebar. If you add a new session, it will create a new branch to store the output of that. If you want to continue work on a branch, you can simply click on it to switch contexts.
In GitButler, each branch is also an agent session with its own context. You can see each branch in the Agents Tab sidebar. If you add a new session, it will create a new branch to store the output of that. If you want to continue work on a branch, you can simply click on it to switch contexts.

You can have multiple agents working on branches at the same time - you can see which branches have active tasks running at a glance with the running indicator:

Expand Down
2 changes: 1 addition & 1 deletion content/docs/features/ai-integration/mcp-server.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ If you generate code or modify files, run the gitbutler update branches MCP tool

## How to add rules

Cursor stores it's rules in `~/.cursor/rules` file, but you can also manually set them by going to the Cursor Settings pane, clicking 'Rules' and adding them to the User Rules section.
Cursor stores its rules in `~/.cursor/rules` file, but you can also manually set them by going to the Cursor Settings pane, clicking 'Rules' and adding them to the User Rules section.

In VSCode's Copilot Agent Mode, you can use ["custom instructions"](https://code.visualstudio.com/docs/copilot/copilot-customization#_custom-instructions) to accomplish this.

Expand Down
2 changes: 1 addition & 1 deletion content/docs/features/branch-management/merging.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ In this case, when you perform the rebase, that branch will then contain "confli
subtitle="When your commits have conflicts"
/>

When you click that, GitButler will remove the other virtual branches and other work from your working directory and check out just this commit with it's conflict markers. It will show you a special "edit mode" screen, where you are directly editing this commit.
When you click that, GitButler will remove the other virtual branches and other work from your working directory and check out just this commit with its conflict markers. It will show you a special "edit mode" screen, where you are directly editing this commit.

<ImageSection
className="mx-auto"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ There are lots of other ways to set up GPG or SSH commit signing:
- Here is a nice simple gist for [GPG signing on Windows](https://gist.github.com/BoGnY/f9b1be6393234537c3e247f33e74094a).

<Callout title="Using GitButler's Generated SSH Key">
Earlier versions of GitButler would only sign with it's generated SSH key. Although we've removed that functionality, you can easily set it back up by pointing the signingKey at the generated SSH Key. The key is located in the following locations:
Earlier versions of GitButler would only sign with its generated SSH key. Although we've removed that functionality, you can easily set it back up by pointing the signingKey at the generated SSH Key. The key is located in the following locations:

<Tabs groupId="platform" items={['macOS', 'Windows', 'Linux']} persist>
<Tab value="macOS">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ With normal Git branching, you can only work on one branch at a time. There is o

With virtual branches, you can have multiple branches applied to your working directory at the same time. Each branch is represented as a vertical lane, and you can drag changes between these lanes to commit them independently.

Each lane also has it's own staging area, so you can stage changes for each branch before deciding to commit them.
Each lane also has its own staging area, so you can stage changes for each branch before deciding to commit them.

<ImageSection
className="mx-auto"
Expand Down
2 changes: 1 addition & 1 deletion content/docs/features/gerrit-mode.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ To manually turn on Gerrit Mode in GitButler, you just have to set a Git config

## What is Gerrit Mode

Now GitButler will change it's behavior in the following ways:
Now GitButler will change its behavior in the following ways:

- When you commit, we will automatically inject a `Change-Id` trailer into the commit in the format that Gerrit expects. You do not need to [setup a `commit-msg` hook](https://gerrit-review.googlesource.com/Documentation/cmd-hook-commit-msg.html) like you do with other Git clients.
- When you push, it will not push to a matching branch name on the remote. Instead it will push to `refs/for/main` (or whatever the name of the target branch is set to be).
Expand Down
2 changes: 1 addition & 1 deletion content/docs/overview.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Since there isn't just a single branch you can be on, you don't "switch" branche
src="https://gitbutler-docs-images-public.s3.us-east-1.amazonaws.com/unapply-stack.png"
width="800"
height="600"
subtitle="Click 'unapply' for any branch to stash it and remove it's changes from the working directory"
subtitle="Click 'unapply' for any branch to stash it and remove its changes from the working directory"
alt="Virtual Branch Apply / Unapply"
/>

Expand Down
12 changes: 6 additions & 6 deletions public/llms-full.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@ We will do some cool things as it runs, however.

### One Branch Per Session

In GitButler, each branch is also an agent session with it's own context. You can see each branch in the Agents Tab sidebar. If you add a new session, it will create a new branch to store the output of that. If you want to continue work on a branch, you can simply click on it to switch contexts.
In GitButler, each branch is also an agent session with its own context. You can see each branch in the Agents Tab sidebar. If you add a new session, it will create a new branch to store the output of that. If you want to continue work on a branch, you can simply click on it to switch contexts.

You can have multiple agents working on branches at the same time - you can see which branches have active tasks running at a glance with the running indicator:

Expand Down Expand Up @@ -1614,7 +1614,7 @@ In this case, when you perform the rebase, that branch will then contain "confli
subtitle="When your commits have conflicts"
/>

When you click that, GitButler will remove the other virtual branches and other work from your working directory and check out just this commit with it's conflict markers. It will show you a special "edit mode" screen, where you are directly editing this commit.
When you click that, GitButler will remove the other virtual branches and other work from your working directory and check out just this commit with its conflict markers. It will show you a special "edit mode" screen, where you are directly editing this commit.

<ImageSection
className="mx-auto"
Expand Down Expand Up @@ -1872,7 +1872,7 @@ There are lots of other ways to set up GPG or SSH commit signing:
- Here is a nice simple gist for [GPG signing on Windows](https://gist.github.com/BoGnY/f9b1be6393234537c3e247f33e74094a).

<Callout title="Using GitButler's Generated SSH Key">
Earlier versions of GitButler would only sign with it's generated SSH key. Although we've removed that functionality, you can easily set it back up by pointing the signingKey at the generated SSH Key. The key is located in the following locations:
Earlier versions of GitButler would only sign with its generated SSH key. Although we've removed that functionality, you can easily set it back up by pointing the signingKey at the generated SSH Key. The key is located in the following locations:

<Tabs groupId="platform" items={['macOS', 'Windows', 'Linux']} persist>
<Tab value="macOS">
Expand Down Expand Up @@ -1995,7 +1995,7 @@ With normal Git branching, you can only work on one branch at a time. There is o

With virtual branches, you can have multiple branches applied to your working directory at the same time. Each branch is represented as a vertical lane, and you can drag changes between these lanes to commit them independently.

Each lane also has it's own staging area, so you can stage changes for each branch before deciding to commit them.
Each lane also has its own staging area, so you can stage changes for each branch before deciding to commit them.

<ImageSection
className="mx-auto"
Expand Down Expand Up @@ -2343,7 +2343,7 @@ If you generate code or modify files, run the gitbutler update branches MCP tool

## How to add rules

Cursor stores it's rules in `~/.cursor/rules` file, but you can also manually set them by going to the Cursor Settings pane, clicking 'Rules' and adding them to the User Rules section.
Cursor stores its rules in `~/.cursor/rules` file, but you can also manually set them by going to the Cursor Settings pane, clicking 'Rules' and adding them to the User Rules section.

In VSCode's Copilot Agent Mode, you can use ["custom instructions"](https://code.visualstudio.com/docs/copilot/copilot-customization#_custom-instructions) to accomplish this.

Expand Down Expand Up @@ -2606,7 +2606,7 @@ In this directory, there should be rolling daily logs:

## Data Files

GitButler also keeps it's own data about each of your projects. The virtual branch metadata, your user config stuff, a log of changes in each file, etc. If you want to inspect what GitButler is doing or debug or reset everything, you can go to our data directory.
GitButler also keeps its own data about each of your projects. The virtual branch metadata, your user config stuff, a log of changes in each file, etc. If you want to inspect what GitButler is doing or debug or reset everything, you can go to our data directory.

<Tabs groupId="platform" items={['macOS', 'Windows', 'Linux']} persist>
<Tab value="macOS">
Expand Down