jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-22 11:26:57 -05:00
Code Issues Projects Releases Wiki Activity

[Core] Add a language to every code block (#39212)

Browse Source 
Co-authored-by: Peter Bengtsson <mail@peterbe.com>
This commit is contained in:
Sophie
2023-09-20 14:29:13 +02:00
committed by GitHub
parent 546cd38681
commit 0ec2addb2a
34 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/get-started/using-git/about-git-rebase.md
View File

@@ -70,7 +70,7 @@ There are six commands available while rebasing:
No matter which command you use, Git will launch [your default text editor](/get-started/getting-started-with-git/associating-text-editors-with-git) and open a file that details the commits in the range you've chosen. That file looks something like this:
```
```text
pick 1fc6c95 Patch A
pick 6b2481b Patch B
pick dd1475d something I want to split

10
content/get-started/using-git/using-git-rebase-on-the-command-line.md
View File

@@ -20,7 +20,7 @@ In this example, we will cover all of the `git rebase` commands available, excep
We'll start our rebase by entering `git rebase --interactive HEAD~7` on the terminal. Our favorite text editor will display the following lines:
```
```text
pick 1fc6c95 Patch A
pick 6b2481b Patch B
pick dd1475d something I want to split
@@ -42,7 +42,7 @@ Phew! This sounds like a lot of work, but by taking it one step at a time, we ca
To start, we'll need to modify the commands in the file to look like this:
```
```text
pick 1fc6c95 Patch A
squash fa39187 something to add to patch A
pick 7b36971 something to move before patch B
@@ -58,7 +58,7 @@ Now, save and close the editor; this will start the interactive rebase.
Git skips the first rebase command, `pick 1fc6c95`, since it doesn't need to do anything. It goes to the next command, `squash fa39187`. Since this operation requires your input, Git opens your text editor once again. The file it opens up looks something like this:
```
```text
# This is a combination of two commits.
# The first commit's message is:
@@ -82,7 +82,7 @@ This file is Git's way of saying, "Hey, here's what I'm about to do with this `s
When the editor is closed, the rebase continues:
```
```text
pick 1fc6c95 Patch A
squash fa39187 something to add to patch A
pick 7b36971 something to move before patch B
@@ -110,7 +110,7 @@ At this point, you can edit any of the files in your project to make any additio
Git then gets to the `reword 4ca2acc` command. It opens up your text editor one more time, and presents the following information:
```
```text
i cant' typ goods
# Please enter the commit message for your changes. Lines starting