Linux command
git-imerge 命令
文件
复制后可按需替换文件名、目录或参数。
常用示例
Start an incremental merge
git imerge start --name=[merge-name] [branch]
Start an incremental rebase
git imerge rebase [branch]
Continue resolving
git imerge continue
Show visual merge
git imerge diagram
Finish the merge
git imerge finish
List all in-progress
git imerge list
Abort and remove
git imerge remove
说明
git imerge performs incremental, bisect-style merges. Instead of one large merge with many conflicts, it merges commits one at a time, making conflict resolution more manageable and helping identify exactly which commits cause conflicts. The tool tracks merge progress visually via the diagram command and allows conflicts to be resolved independently. This approach is particularly valuable for difficult merges between long-diverged branches.
参数
- start
- Begin incremental merge.
- merge
- Start an incremental merge (shorthand for start --goal merge).
- rebase
- Start an incremental rebase (shorthand for start --goal rebase).
- continue
- Continue resolving conflicts.
- finish
- Complete the incremental merge.
- remove
- Abort and remove incremental merge state.
- diagram
- Show visual merge status grid.
- list
- List all in-progress incremental merges.
- autofill
- Attempt to fill in all merge blocks automatically.
- simplify
- Simplify the merge history after finishing.
- init
- Initialize an imerge from existing merge state.
- record
- Record the result of a merge done manually.
- drop
- Drop a commit from the merge.
- revert
- Revert a commit in the merge.
- --name _NAME_
- Name for the incremental merge.
- --goal _GOAL_
- Merge goal: merge, rebase, rebase-with-history, border, border-with-history.
- --first-parent
- Handle first-parent history only.
- --force
- Force start even if one is already in progress.
- --help
- Display help information.
FAQ
What is the git-imerge command used for?
git imerge performs incremental, bisect-style merges. Instead of one large merge with many conflicts, it merges commits one at a time, making conflict resolution more manageable and helping identify exactly which commits cause conflicts. The tool tracks merge progress visually via the diagram command and allows conflicts to be resolved independently. This approach is particularly valuable for difficult merges between long-diverged branches.
How do I run a basic git-imerge example?
Run `git imerge start --name=[merge-name] [branch]` in a terminal, then adjust file names, paths, flags, or remote targets for your system.
What does start do in git-imerge?
Begin incremental merge.