update with fix

Author: schacon

content/docs/cli-guides/cli-tutorial/branching-and-commiting.mdx

@@ -58,7 +58,7 @@ To do this, you can use the `but branch new <branch-name>` command.
 
 {/* run git branch -D user-bookmarks */}
 
-```cli [branching-and-commiting-but-branch-1, 110px]
+```cli [branching-and-commiting-but-branch-1, 88px]
 but branch new user-bookmarks
 ```
 
@@ -72,7 +72,7 @@ but status
 
 Now we can commit our unassigned changes to that branch. You can simply assign your changes to the branch first to commit later (we'll cover that later in [Rubbing](./rubbing)), but for now let's keep it simple and just commit them directly using the `but commit` command.
 
-```cli [branching-and-commiting-but-commit-1, 110px]
+```cli [branching-and-commiting-but-commit-1, 88px]
 but commit -m 'all the user bookmarks'
 ```
 
@@ -109,7 +109,7 @@ To create a parallel branch, you simply create a new branch the same way we did
 {/* run echo 'test' > app/controllers/likes_controller.rb */}
 {/* run echo 'test' > app/models/like.rb */}
 
-```cli [branching-and-commiting-but-branch-2, 110px]
+```cli [branching-and-commiting-but-branch-2, 88px]
 but branch new liked-tweets
 ```
 
@@ -121,7 +121,7 @@ but status
 
 We can see our previous branch and the commit we made, our new empty branch and a couple of modified files. Now we can commit the unassigned changes to that branch with `but commit -m "liked tweets changes" liked-tweets`
 
-```cli [branching-and-commiting-but-commit-2, 110px]
+```cli [branching-and-commiting-but-commit-2, 88px]
 but commit -m "liked tweets changes" liked-tweets
 ```
 
@@ -150,7 +150,7 @@ To create a new stacked branch in GitButler, you can run `but branch new` with a
 {/* run git branch -D liked-tweets-stacked */}
 {/* restore [e32713a1f41c] */}
 
-```cli [branching-and-commiting-but-branch-3, 110px]
+```cli [branching-and-commiting-but-branch-3, 88px]
 but branch new -a user-bookmarks liked-tweets-stacked
 ```
 
@@ -160,7 +160,7 @@ but status
 
 Now we can commit to our stacked branch.
 
-```cli [branching-and-commiting-but-commit-3, 110px]
+```cli [branching-and-commiting-but-commit-3, 88px]
 but commit -m "liked tweets changes" liked-tweets-stacked
 ```
 
@@ -221,7 +221,7 @@ Now, if we want to create a commit in the `user-bookmarks` branch, we can either
 
 Or, we can make a commit with _only_ the assigned files in `user-bookmarks` by using the `-o` option to `but commit`.
 
-```cli [branching-and-commiting-but-commit-4, 110px]
+```cli [branching-and-commiting-but-commit-4, 88px]
 but commit -o -m "liked tweets view" bo
 ```
 
@@ -233,7 +233,7 @@ but st
 
 Now let's commit all the rest of the changes (assigned and unassigned) to our other branch:
 
-```cli [branching-and-commiting-but-commit-5, 110px]
+```cli [branching-and-commiting-but-commit-5, 88px]
 but commit -m 'bookmarks stuff' ch
 ```
 

content/docs/cli-guides/cli-tutorial/configuration.mdx

@@ -7,15 +7,15 @@ We've already covered `but config` a bit in dealing with forges and target branc
 
 You can also use it for some basic user configuration, such as setting your name and email address for commits and your default editor.
 
-```cli [configuration-but-config-1, 308px]
+```cli [configuration-but-config-1, 286px]
 but config user
 ```
 
 ## Aliases
 
 GitButler also has a built in aliasing system in case you want to provide some shorthands.
 
-```cli [configuration-but-alias-1, 308px]
+```cli [configuration-but-alias-1, 286px]
 but alias
 ```
 

content/docs/cli-guides/cli-tutorial/conflict-resolution.mdx

@@ -29,7 +29,7 @@ but status
 
 Let's say that this is our status and we've decided to pull in from upstream. The changes that have been merged in by someone else upstream conflict with ours. When we run `but pull`, it will result in conflicts in our branch (but it will succeed).
 
-```cli [conflict-resolution-but-pull-1, 308px]
+```cli [conflict-resolution-but-pull-1, 286px]
 but pull
 ```
 

content/docs/cli-guides/cli-tutorial/editing-commits.mdx

@@ -42,7 +42,7 @@ Pretty simple.
 
 Just like changing commit messages, you can also use `but reword` to change the name of a branch. So, in the above example, if we wanted to change the branch name from `user-bookmarks` to `feature-awesome-thing`, we can do this:
 
-```cli [editing-commits-but-reword-1, 110px]
+```cli [editing-commits-but-reword-1, 88px]
 but reword -m feature-awesome-thing us
 ```
 

content/docs/cli-guides/cli-tutorial/forges.mdx

@@ -50,7 +50,7 @@ Once it's opened, you'll get a URL you can view the pull request on.
 
 In order to open a PR on GitHub, you'll need to authenticate to that forge. You can see which authentications you have by running `but config`:
 
-```cli [forges-but-config-1, 506px]
+```cli [forges-but-config-1, 572px]
 but config
 ```
 

content/docs/cli-guides/cli-tutorial/inspecting.mdx

@@ -57,7 +57,7 @@ This output is actually _better_ than the default Git output for this, because I
 
 The `but branch` command, however, is built specifically to help you identify the branches you're looking for and give you some useful information about them. Let's give it a try:
 
-```cli [inspecting-but-branch-1, 660px]
+```cli [inspecting-but-branch-1, 638px]
 but branch
 ```
 
@@ -77,7 +77,7 @@ The point of this listing is to help you easily see what work you have available
 
 Running `but branch` defaults to running `but branch list`, which has a bunch of other options (filtering to only local or remote branches, not calculating mergability for speed, etc). The most useful option might be the filtering, for example, you can type a partial match string and it will filter the output:
 
-```cli [inspecting-but-branch-2, 242px]
+```cli [inspecting-but-branch-2, 220px]
 but branch list book
 ```
 
@@ -93,7 +93,7 @@ git log origin/main..feature-awesome-thing
 
 Now let's look at `but branch show`
 
-```cli [inspecting-but-branch-3, 286px]
+```cli [inspecting-but-branch-3, 264px]
 but branch show feature-awesome-thing
 ```
 
@@ -105,15 +105,15 @@ The real fun one is adding `--ai`, which will take a look at the changes and sum
 
 Let's run all of them at the same time:
 
-```cli [inspecting-but-branch-4, 704px]
+```cli [inspecting-but-branch-4, 682px]
 but branch show sc-branch-28 --ai -r -f
 ```
 
 ## Showing a Commit
 
 If you want to look at a specific commit in any of these circumstances, you can use the `but show` command with the commit hash.
 
-```cli [inspecting-but-show-1, 286px]
+```cli [inspecting-but-show-1, 264px]
 but show a42580b96ed7b432
 ```
 

content/docs/cli-guides/cli-tutorial/operations-log.mdx

@@ -17,7 +17,7 @@ but oplog
 
 Undo the last operation:
 
-```cli [operations-log-but-undo-1, 154px]
+```cli [operations-log-but-undo-1, 132px]
 but undo
 ```
 

content/docs/cli-guides/cli-tutorial/rubbing.mdx

@@ -42,11 +42,11 @@ but status
 
 If we want to update the first commit (`da42d06`) with the `README-es.md` changes and the last commit (`fdbd753`) with the `app/views/bookmarks/index.html.erb` changes, we can run the following two `rub` commands:
 
-```cli [rubbing-but-rub-1, 110px]
+```cli [rubbing-but-rub-1, 88px]
 but rub h0 da42d06
 ```
 
-```cli [rubbing-but-rub-2, 110px]
+```cli [rubbing-but-rub-2, 88px]
 but rub app/views/bookmarks/index.html.erb fdbd753
 ```
 
@@ -72,7 +72,7 @@ but status
 
 We can absorb the top commit into the bottom one by running `but rub <commit-squash> <commit-target>`:
 
-```cli [rubbing-but-rub-3, 110px]
+```cli [rubbing-but-rub-3, 88px]
 but rub 0f 08
 ```
 
@@ -98,7 +98,7 @@ but status
 
 And we want to un-commit the first commit (`0fa2965`) as though we had never made it, you can rub to `zz`:
 
-```cli [rubbing-but-rub-4, 110px]
+```cli [rubbing-but-rub-4, 88px]
 but rub 0f zz
 ```
 
@@ -122,7 +122,7 @@ but status
 
 We can move the “second commit” commit to the `move-second-commit` branch with `but rub`:
 
-```cli [rubbing-but-rub-5, 110px]
+```cli [rubbing-but-rub-5, 88px]
 but rub 0f mo
 ```
 
@@ -186,7 +186,7 @@ but commit empty --after 6a
 
 Now we have a blank commit:
 
-```cli [rubbing-but-status-13, 440px]
+```cli [rubbing-but-status-13, 462px]
 but status -f
 ```
 

content/docs/cli-guides/cli-tutorial/scripting.mdx

@@ -7,7 +7,7 @@ description: How to script with GitButler CLI
 
 All of the commands are designed to be very user friendly when we have an interactive terminal, but you can also very easily script everything by passing the `--json` or `-j` option to anything. For example, here is using `but show` on a commit.
 
-```cli [scripting-but-show-1, 330px]
+```cli [scripting-but-show-1, 308px]
 but show 2672465
 ```
 

content/docs/cli-guides/cli-tutorial/updating-the-base.mdx

@@ -15,13 +15,13 @@ When GitButler is first initialized in a project, you are asked to choose a bran
 
 You can always check your target branch setting with `but config`:
 
-```cli [updating-the-base-but-config-1, 506px]
+```cli [updating-the-base-but-config-1, 572px]
 but config
 ```
 
 Or get more information with `but config target`:
 
-```cli [updating-the-base-but-config-2, 330px]
+```cli [updating-the-base-but-config-2, 308px]
 but config target
 ```
 
@@ -70,7 +70,7 @@ Technically, there could be more reachable commits, but we only show the first p
 
 Now let's say that we would like to pull in the upstream work and rebase our branches on top of the new upstream to update them. We can check what all would happen with `but pull --check`.
 
-```cli [updating-the-base-but-pull-1, 330px]
+```cli [updating-the-base-but-pull-1, 308px]
 but pull --check
 ```
 
@@ -92,7 +92,7 @@ When you feel like you want to get your active branches up to date, you can run
 
 Let's run it in our example.
 
-```cli [updating-the-base-but-pull-2, 418px]
+```cli [updating-the-base-but-pull-2, 396px]
 but pull
 ```