ivuorinen/cheatsheet-tldr
1
0
Fork 0
mirror of https://github.com/ivuorinen/cheatsheet-tldr.git synced 2026-02-18 07:49:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cheatsheets

Browse Source
This commit is contained in:
ivuorinen
2024-09-01 00:19:16 +00:00
parent a05eb0e931
commit bb9d5922fa
24 changed files with 60 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tldr/git-rebase
View File

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