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

Update cheatsheets

Browse Source
This commit is contained in:
ivuorinen
2025-03-08 00:14:59 +00:00
parent a812b3c467
commit f8bee5305f
111 changed files with 540 additions and 310 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|--interactive}} {{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:
@@ -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|--interactive}} {{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 {{-X|--strategy-option}} theirs {{branch_name}}`
`git rebase {{[-X|--strategy-option]}} theirs {{branch_name}}`