Skip to content

Commit c1e8752

Browse files
committed
update rubbing to fix determinism issue
1 parent ae3b997 commit c1e8752

23 files changed

+167
-119
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ but status
6666

6767
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.
6868

69-
```cli [927c817ed73b68c7, 88px]
69+
```cli [d717a67c1accab44, 88px]
7070
but commit -m 'all the user bookmarks'
7171
```
7272

7373
If you don’t specify the `-m` commit message, GitButler will try to open an editor with a tempfile where you can write a longer commit message. It will use the `$EDITOR` environment variable if it’s set, or the `core.editor` Git or GitButler config setting, or it will prompt you for a command to run if you’re in an interactive terminal.
7474

7575
Now our status looks like this, with all unassigned files in a new commit on our new branch:
7676

77-
```cli [0000fdfa2b5ec92b, 220px]
77+
```cli [bdaa2dcbd8b894ef, 220px]
7878
but status
7979
```
8080

@@ -98,19 +98,19 @@ but branch new liked-tweets
9898

9999
Now if we run `but status` we can see our previous branch and our new empty branch.
100100

101-
```cli [b5b56bebb89dedc3, 330px]
101+
```cli [29d022b78235e251, 330px]
102102
but status
103103
```
104104

105105
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`
106106

107-
```cli [bd4f40610e40f1b5, 88px]
107+
```cli [5d0f6f51e7449095, 88px]
108108
but commit -m "liked tweets changes" liked-tweets
109109
```
110110

111111
And now we have one commit in each lane.
112112

113-
```cli [1eccbe4db529d72f, 308px]
113+
```cli [6656c445d61aa876, 308px]
114114
but status
115115
```
116116

@@ -120,7 +120,7 @@ If you don’t specify a branch identifier and you have more than one active bra
120120

121121
We can also see which files were modified in each commit with the `--files` or `-f` option to `but status`:
122122

123-
```cli [f3c56e67a1e24971, 484px]
123+
```cli [f808c081358b0b3d, 484px]
124124
but status -f
125125
```
126126

@@ -143,11 +143,11 @@ but status
143143

144144
Now we can commit to our stacked branch.
145145

146-
```cli [de923765534564a6, 88px]
146+
```cli [d6a4f4f7e6193ab3, 88px]
147147
but commit -m "liked tweets changes" liked-tweets-stacked
148148
```
149149

150-
```cli [9d97a568b3786b14, 286px]
150+
```cli [b3259abf9ec92476, 286px]
151151
but status
152152
```
153153

@@ -202,23 +202,23 @@ Now, if we want to create a commit in the `user-bookmarks` branch, we can either
202202

203203
Or, we can make a commit with _only_ the assigned files in `user-bookmarks` by using the `-o` option to `but commit`.
204204

205-
```cli [79a511563972cc8f, 88px]
205+
```cli [db9986aeb0ff50fa, 88px]
206206
but commit -o -m "liked tweets view" h4
207207
```
208208

209209
Now if we look at our status we can see a commit on our branch instead of the assigned changes:
210210

211-
```cli [24f5456cca204e8d, 396px]
211+
```cli [fc68154f9c1f9d0a, 396px]
212212
but status
213213
```
214214

215215
Now let's commit all the rest of the changes (assigned and unassigned) to our other branch:
216216

217-
```cli [682139bab4bdc57d, 88px]
217+
```cli [0a82b554b0ccd94a, 88px]
218218
but commit -m 'bookmarks stuff' nd
219219
```
220220

221-
```cli [f93e374ac2785a90, 308px]
221+
```cli [a8645f9c1c4ed254, 308px]
222222
but status
223223
```
224224

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ GitButler maintains a detailed log of all operations, making it easy to track wh
99

1010
See all recent GitButler operations:
1111

12-
```cli [61a4ed332fc62e70, 550px]
12+
```cli [d56ec4583e46b761, 550px]
1313
but oplog
1414
```
1515

1616
## Undoing the last operation
1717

1818
Undo the last operation:
1919

20-
```cli [95763a83f458be55, 132px]
20+
```cli [a5c655fd3216bb9d, 132px]
2121
but undo
2222
```
2323

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,13 @@ but status -f
141141

142142
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:
143143

144-
```cli [03420f08f4e2df55, 176px]
145-
but rub pm f5
144+
```cli [20c8dd61540479ef, 88px]
145+
but rub vo f5
146146
```
147147

148148
Now the change is in the previous commit:
149149

150-
```cli [2f4817399ff46441, 682px]
150+
```cli [6b84f918aca6eb05, 682px]
151151
but status -f
152152
```
153153

@@ -167,16 +167,16 @@ but status
167167

168168
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).
169169

170-
We can insert a blank commit by running `but new 06` which inserts a blank commit under the specified commit.
170+
We can insert a blank commit by running `but new f5` which inserts a blank commit under the specified commit.
171171

172-
```cli [711027350744cca1, 88px]
173-
but new 06
172+
```cli [5326a91276d35e82, 88px]
173+
but new f5
174174
```
175175

176176
Now we have a blank commit:
177177

178-
```cli [bfafb0a0ab77bc27, 704px]
178+
```cli [814da470705a208e, 726px]
179179
but status -f
180180
```
181181

182-
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).
182+
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).

public/cache/cli-output/03420f08f4e2df55.html

Lines changed: 0 additions & 28 deletions
This file was deleted.

public/cache/cli-output/682139bab4bdc57d.html renamed to public/cache/cli-output/0a82b554b0ccd94a.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</style>
1919
</head>
2020
<body>
21-
<pre>Created commit f35a14a on branch user-bookmarks
21+
<pre>Created commit e36adcf on branch user-bookmarks
2222
</pre>
2323
</body>
2424
</html>
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>/usr/local/bin/but rub vo f5</title>
6+
<style>
7+
body {
8+
background-color: #ffffff;
9+
color: #24292e;
10+
font-family: 'Consolas', 'Courier New', monospace;
11+
padding: 20px;
12+
margin: 0;
13+
}
14+
pre {
15+
white-space: pre-wrap;
16+
word-wrap: break-word;
17+
}
18+
</style>
19+
</head>
20+
<body>
21+
<pre>Moved files between commits!
22+
</pre>
23+
</body>
24+
</html>

public/cache/cli-output/b5b56bebb89dedc3.html renamed to public/cache/cli-output/29d022b78235e251.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<u><span style='color:var(--blue,#00a)'>ou</span></u> M <span style='color:var(--yellow,#a60)'>app/models/like.rb</span>
2424
2525
┊╭┄<u><span style='color:var(--blue,#00a)'>nd</span></u> [<b><span style='color:var(--green,#0a0)'>user-bookmarks</span></b>]
26-
┊● <u><span style='color:var(--blue,#00a)'>e8</span></u><span style='opacity:0.67'>6dada</span> all the user bookmarks
26+
┊● <u><span style='color:var(--blue,#00a)'>3a</span></u><span style='opacity:0.67'>1658b</span> all the user bookmarks
2727
├╯
2828
2929
┊╭┄<u><span style='color:var(--blue,#00a)'>u1</span></u> [<b><span style='color:var(--green,#0a0)'>liked-tweets</span></b>] <span style='opacity:0.67'><i>(no commits)</i></span>
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>/usr/local/bin/but new f5</title>
6+
<style>
7+
body {
8+
background-color: #ffffff;
9+
color: #24292e;
10+
font-family: 'Consolas', 'Courier New', monospace;
11+
padding: 20px;
12+
margin: 0;
13+
}
14+
pre {
15+
white-space: pre-wrap;
16+
word-wrap: break-word;
17+
}
18+
</style>
19+
</head>
20+
<body>
21+
<pre>Created blank commit before commit f55a30e
22+
</pre>
23+
</body>
24+
</html>

public/cache/cli-output/bd4f40610e40f1b5.html renamed to public/cache/cli-output/5d0f6f51e7449095.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</style>
1919
</head>
2020
<body>
21-
<pre>Created commit 65b17f7 on branch liked-tweets
21+
<pre>Created commit 87b1f79 on branch liked-tweets
2222
</pre>
2323
</body>
2424
</html>

public/cache/cli-output/1eccbe4db529d72f.html renamed to public/cache/cli-output/6656c445d61aa876.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<pre>╭┄<u><span style='color:var(--blue,#00a)'>00</span></u> [<b><span style='color:var(--green,#0a0)'>Unassigned Changes</span></b>]
2222
2323
┊╭┄<u><span style='color:var(--blue,#00a)'>nd</span></u> [<b><span style='color:var(--green,#0a0)'>user-bookmarks</span></b>]
24-
┊● <u><span style='color:var(--blue,#00a)'>e8</span></u><span style='opacity:0.67'>6dada</span> all the user bookmarks
24+
┊● <u><span style='color:var(--blue,#00a)'>3a</span></u><span style='opacity:0.67'>1658b</span> all the user bookmarks
2525
├╯
2626
2727
┊╭┄<u><span style='color:var(--blue,#00a)'>u1</span></u> [<b><span style='color:var(--green,#0a0)'>liked-tweets</span></b>]
28-
┊● <u><span style='color:var(--blue,#00a)'>65</span></u><span style='opacity:0.67'>b17f7</span> liked tweets changes
28+
┊● <u><span style='color:var(--blue,#00a)'>87</span></u><span style='opacity:0.67'>b1f79</span> liked tweets changes
2929
├╯
3030
3131
<span style='color:var(--magenta,#a0a)'></span> <span style='opacity:0.67'>204e309</span> (common base) [<b><span style='color:var(--green,#0a0)'>origin/main</span></b>] Merge pull request #10 from schacon/sc-description

0 commit comments

Comments
 (0)