diff --git a/content/docs/cli-guides/cli-tutorial/branching-and-commiting.mdx b/content/docs/cli-guides/cli-tutorial/branching-and-commiting.mdx index 1a3ce9d..4d65d41 100644 --- a/content/docs/cli-guides/cli-tutorial/branching-and-commiting.mdx +++ b/content/docs/cli-guides/cli-tutorial/branching-and-commiting.mdx @@ -66,7 +66,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](https://www.notion.so/Rubbing-2545a4bfdeac80209d37cd4d629316cc?pvs=21)), but for now let’s keep it simple and just commit them directly using the `but commit` command. -```cli [927c817ed73b68c7, 88px] +```cli [d717a67c1accab44, 88px] but commit -m 'all the user bookmarks' ``` @@ -74,7 +74,7 @@ If you don’t specify the `-m` commit message, GitButler will try to open an ed Now our status looks like this, with all unassigned files in a new commit on our new branch: -```cli [0000fdfa2b5ec92b, 220px] +```cli [bdaa2dcbd8b894ef, 220px] but status ``` @@ -98,19 +98,19 @@ but branch new liked-tweets Now if we run `but status` we can see our previous branch and our new empty branch. -```cli [b5b56bebb89dedc3, 330px] +```cli [29d022b78235e251, 330px] 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 [bd4f40610e40f1b5, 88px] +```cli [5d0f6f51e7449095, 88px] but commit -m "liked tweets changes" liked-tweets ``` And now we have one commit in each lane. -```cli [1eccbe4db529d72f, 308px] +```cli [6656c445d61aa876, 308px] but status ``` @@ -120,7 +120,7 @@ If you don’t specify a branch identifier and you have more than one active bra We can also see which files were modified in each commit with the `--files` or `-f` option to `but status`: -```cli [f3c56e67a1e24971, 484px] +```cli [f808c081358b0b3d, 484px] but status -f ``` @@ -143,11 +143,11 @@ but status Now we can commit to our stacked branch. -```cli [de923765534564a6, 88px] +```cli [d6a4f4f7e6193ab3, 88px] but commit -m "liked tweets changes" liked-tweets-stacked ``` -```cli [9d97a568b3786b14, 286px] +```cli [b3259abf9ec92476, 286px] but status ``` @@ -202,23 +202,23 @@ 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 [79a511563972cc8f, 88px] +```cli [db9986aeb0ff50fa, 88px] but commit -o -m "liked tweets view" h4 ``` Now if we look at our status we can see a commit on our branch instead of the assigned changes: -```cli [24f5456cca204e8d, 396px] +```cli [fc68154f9c1f9d0a, 396px] but status ``` Now let's commit all the rest of the changes (assigned and unassigned) to our other branch: -```cli [682139bab4bdc57d, 88px] +```cli [0a82b554b0ccd94a, 88px] but commit -m 'bookmarks stuff' nd ``` -```cli [f93e374ac2785a90, 308px] +```cli [a8645f9c1c4ed254, 308px] but status ``` diff --git a/content/docs/cli-guides/cli-tutorial/operations-log.mdx b/content/docs/cli-guides/cli-tutorial/operations-log.mdx index 8688075..6ad26d0 100644 --- a/content/docs/cli-guides/cli-tutorial/operations-log.mdx +++ b/content/docs/cli-guides/cli-tutorial/operations-log.mdx @@ -9,7 +9,7 @@ GitButler maintains a detailed log of all operations, making it easy to track wh See all recent GitButler operations: -```cli [61a4ed332fc62e70, 550px] +```cli [d56ec4583e46b761, 550px] but oplog ``` @@ -17,7 +17,7 @@ but oplog Undo the last operation: -```cli [95763a83f458be55, 132px] +```cli [a5c655fd3216bb9d, 132px] but undo ``` diff --git a/content/docs/cli-guides/cli-tutorial/rubbing.mdx b/content/docs/cli-guides/cli-tutorial/rubbing.mdx index 5213eab..734cb02 100644 --- a/content/docs/cli-guides/cli-tutorial/rubbing.mdx +++ b/content/docs/cli-guides/cli-tutorial/rubbing.mdx @@ -141,13 +141,13 @@ but status -f So now we can move the changes from one commit to another by rubbing pretty easily. Let’s take the `app/controllers/bookmarks_controller.rb` change and move it down to the "add bookmark model and associations" commit: -```cli [03420f08f4e2df55, 176px] -but rub pm f5 +```cli [20c8dd61540479ef, 88px] +but rub vo f5 ``` Now the change is in the previous commit: -```cli [2f4817399ff46441, 682px] +```cli [6b84f918aca6eb05, 682px] but status -f ``` @@ -167,16 +167,16 @@ but status Now we want to split the "add bookmark model and associations" into two separate commits. The way we do this is to insert a blank commit in between `06` and `f5` and then rub changes into it (then probably edit the commit message). -We can insert a blank commit by running `but new 06` which inserts a blank commit under the specified commit. +We can insert a blank commit by running `but new f5` which inserts a blank commit under the specified commit. -```cli [711027350744cca1, 88px] -but new 06 +```cli [5326a91276d35e82, 88px] +but new f5 ``` Now we have a blank commit: -```cli [bfafb0a0ab77bc27, 704px] +```cli [814da470705a208e, 726px] but status -f ``` -Now we can use the previous method of moving file changes from other commits into it, then edit the commit message with `but describe 6w` (for more on the `describe` command, see [Editing Commits](editing-commits), coming up next). +Now we can use the previous method of moving file changes from other commits into it, then edit the commit message with `but describe 54` (for more on the `describe` command, see [Editing Commits](editing-commits), coming up next). diff --git a/public/cache/cli-output/03420f08f4e2df55.html b/public/cache/cli-output/03420f08f4e2df55.html deleted file mode 100644 index 602a75e..0000000 --- a/public/cache/cli-output/03420f08f4e2df55.html +++ /dev/null @@ -1,28 +0,0 @@ - - -
- - - - -Rubbed the wrong way. Source 'pm' not found. If you just performed a Git operation (squash, rebase, etc.), try running 'but status' to refresh the current state. -Error: Rubbed the wrong way. - -Caused by: - Source 'pm' not found. If you just performed a Git operation (squash, rebase, etc.), try running 'but status' to refresh the current state. -- - \ No newline at end of file diff --git a/public/cache/cli-output/682139bab4bdc57d.html b/public/cache/cli-output/0a82b554b0ccd94a.html similarity index 89% rename from public/cache/cli-output/682139bab4bdc57d.html rename to public/cache/cli-output/0a82b554b0ccd94a.html index 6843750..615a151 100644 --- a/public/cache/cli-output/682139bab4bdc57d.html +++ b/public/cache/cli-output/0a82b554b0ccd94a.html @@ -18,7 +18,7 @@ -
Created commit f35a14a on branch user-bookmarks +Created commit e36adcf on branch user-bookmarks