ivuorinen/cheatsheet-tldr
1
0
Fork 0
mirror of https://github.com/ivuorinen/cheatsheet-tldr.git synced 2026-03-11 09:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cheatsheets

Browse Source
This commit is contained in:
ivuorinen
2025-08-09 00:20:24 +00:00
parent 3be72c1548
commit 388ec4ec4c
73 changed files with 294 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tldr/git-imerge
View File

@@ -3,7 +3,7 @@ syntax: markdown
tags: [tldr, common]
source: https://github.com/tldr-pages/tldr.git
---
# git-imerge
# git imerge
> Perform a merge or rebase between two Git branches incrementally.
> Conflicts between branches are tracked down to pairs of individual commits, to simplify conflict resolution.
@@ -31,4 +31,4 @@ source: https://github.com/tldr-pages/tldr.git
- Abort imerge operation, and return to the previous branch:
`git-imerge remove && git checkout {{previous_branch}}`
`git imerge remove && git checkout {{previous_branch}}`