diff --git a/pages/common/git-imerge.md b/pages/common/git-imerge.md index a5dc65feac515a..669fbd4eca1083 100644 --- a/pages/common/git-imerge.md +++ b/pages/common/git-imerge.md @@ -1,29 +1,29 @@ # git-imerge -> Perform a merge or rebase between two Git branches incrementally. +> Perform an incremental merge or rebase between two Git branches. > Conflicts between branches are tracked down to pairs of individual commits, to simplify conflict resolution. > More information: . - Start imerge-based rebase (checkout the branch to be rebased, first): -`git imerge rebase {{branch_to_rebase_onto}}` +`git-imerge rebase {{branch_to_rebase_onto}}` - Start imerge-based merge (checkout the branch to merge into, first): -`git imerge merge {{branch_to_be_merged}}` +`git-imerge merge {{branch_to_be_merged}}` - Show ASCII diagram of in-progress merge or rebase: -`git imerge diagram` +`git-imerge diagram` - Continue imerge operation after resolving conflicts (`git add` the conflicted files, first): -`git imerge continue --no-edit` +`git-imerge continue` -- Wrap up imerge operation, after all conflicts are resolved: +- Finish a merge or a rebase, after all conflicts are resolved: -`git imerge finish` +`git-imerge finish` -- Abort imerge operation, and return to the previous branch: +- Abort imerge operation and clean up temporary commits: -`git-imerge remove && git checkout {{previous_branch}}` +`git-imerge remove`