jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-19 18:10:59 -05:00
Code Issues Projects Releases Wiki Activity

Part 2: Second fourth content unordered lists from dash to asterisk (#51095)

Browse Source
This commit is contained in:
Grace Park
2024-06-13 10:44:18 -07:00
committed by GitHub
parent 0b94935b77
commit 6acca22e47
385 changed files with 2873 additions and 2842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,11 +31,11 @@ pick 7b36971 something to move before patch B
In this example, we're going to:
- Squash the fifth commit (`fa39187`) into the `"Patch A"` commit (`1fc6c95`), using `squash`.
- Move the last commit (`7b36971`) up before the `"Patch B"` commit (`6b2481b`), and keep it as `pick`.
- Merge the `"A fix for Patch B"` commit (`c619268`) into the `"Patch B"` commit (`6b2481b`), and disregard the commit message using `fixup`.
- Split the third commit (`dd1475d`) into two smaller commits, using `edit`.
- Fix the commit message of the misspelled commit (`4ca2acc`), using `reword`.
* Squash the fifth commit (`fa39187`) into the `"Patch A"` commit (`1fc6c95`), using `squash`.
* Move the last commit (`7b36971`) up before the `"Patch B"` commit (`6b2481b`), and keep it as `pick`.
* Merge the `"A fix for Patch B"` commit (`c619268`) into the `"Patch B"` commit (`6b2481b`), and disregard the commit message using `fixup`.
* Split the third commit (`dd1475d`) into two smaller commits, using `edit`.
* Fix the commit message of the misspelled commit (`4ca2acc`), using `reword`.
Phew! This sounds like a lot of work, but by taking it one step at a time, we can easily make those changes.
@@ -144,4 +144,4 @@ Force pushing has serious implications because it changes the historical sequenc
## Further reading
- "[AUTOTITLE](/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase)"
* "[AUTOTITLE](/get-started/using-git/resolving-merge-conflicts-after-a-git-rebase)"