Skip to content

Commit 8b76417

Browse files
committed
Apply suggestions from peer review
1 parent ed6d790 commit 8b76417

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

source/content/guides/git/05-undo-commits.md

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -179,33 +179,29 @@ You can reset your Dev environment history to match the current state of your Li
179179
180180
<Tab title="All others" id="all-others" active={true}>
181181
182-
1. Identify the most recent commit deployed to Live.
182+
Run the commands below to overwrite the history on Dev's codebase to reflect Live (replace `<site>` with your site's name):
183183
184-
1. Run the command below to overwrite the history on Dev's codebase to reflect Live (replace `<site>` with your site's name):
185-
186-
```bash{promptUser: user}
187-
git reset --hard `terminus env:code-log <site>.live --format=string | grep -m1 'live' | cut -f 4`
188-
git push origin master -f
189-
```
184+
```bash{promptUser: user}
185+
git reset --hard `terminus env:code-log <site>.live --format=string | grep -m1 'live' | cut -f 4`
186+
git push origin master -f
187+
```
190188

191189
</Tab>
192190

193191
<Tab title="Integrated Composer" id="integrated-composer">
194192

195193
<Alert title="Note" type="info">
196194

197-
We've adjusted the following steps for [Integrated Composer sites](/guides/integrated-composer), so that you reset history to the **second** to last commit hash on the Live environment, rather than the first - to avoid resetting dev's history to a build artifact.
195+
We've adjusted the following for [Integrated Composer sites](/guides/integrated-composer), so that you reset history to the **second** to last commit hash on the Live environment, rather than the first - to avoid resetting dev's history to a build artifact.
198196

199197
</Alert>
200198

201-
1. Identify the **second** most recent commit deployed to Live.
199+
Run the commands below to overwrite the history on Dev's codebase to reflect Live (replace `<site>` with your site's name):
202200

203-
1. Run the command below to overwrite the history on Dev's codebase to reflect Live (replace `<site>` with your site's name):
204-
205-
```bash{promptUser: user}
206-
git reset --hard `terminus env:code-log <site>.live --format=string | grep -m2 'live' | tail -n 1 | cut -f 4`
207-
git push origin master -f
208-
```
201+
```bash{promptUser: user}
202+
git reset --hard `terminus env:code-log <site>.live --format=string | grep -m2 'live' | tail -n 1 | cut -f 4`
203+
git push origin master -f
204+
```
209205

210206
</Tab>
211207

0 commit comments

Comments
 (0)