DawnMagnet/tldr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pages*: convert long-short to short-long syntax (#13567)

Browse Source 
* pages*: convert long-short to short-long syntax

* git-add: fix typo
This commit is contained in:
Sebastiaan Speck
2024-09-03 02:43:42 +02:00
committed by GitHub
parent fb7d0ff4c6
commit 380fd5d441
24 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pages/common/git-rebase.md
View File

@@ -10,7 +10,7 @@
- Start an interactive rebase, which allows the commits to be reordered, omitted, combined or modified:
`git rebase {{--interactive|-i}} {{target_base_branch_or_commit_hash}}`
`git rebase {{-i|--interactive}} {{target_base_branch_or_commit_hash}}`
- Continue a rebase that was interrupted by a merge failure, after editing conflicting files:
@@ -30,8 +30,8 @@
- Reapply the last 5 commits in-place, stopping to allow them to be reordered, omitted, combined or modified:
`git rebase {{--interactive|-i}} {{HEAD~5}}`
`git rebase {{-i|--interactive}} {{HEAD~5}}`
- Auto-resolve any conflicts by favoring the working branch version (`theirs` keyword has reversed meaning in this case):
`git rebase {{--strategy-option|-X}} theirs {{branch_name}}`
`git rebase {{-X|--strategy-option}} theirs {{branch_name}}`