back to context overview

git-imerge

List of commands for git-imerge:

- git
git-imerge:tldr:05618 git-imerge: Show ASCII diagram of in-progress merge or rebase.

$ git imerge diagram

try on your machine

explain this command
- git
git-imerge:tldr:3a78e git-imerge: Start imerge-based rebase (checkout the branch to be rebased, first).

$ git imerge rebase ${branch_to_rebase_onto}

try on your machine

explain this command
- git
git-imerge:tldr:4f2ff git-imerge: Continue imerge operation after resolving conflicts (`git add` the conflicted files, first).

$ git imerge continue --no-edit

try on your machine

explain this command
- git
git-imerge:tldr:7262c git-imerge: Wrap up imerge operation, after all conflicts are resolved.

$ git imerge finish

try on your machine

explain this command
- git
git-imerge:tldr:a9f7e git-imerge: Start imerge-based merge (checkout the branch to merge into, first).

$ git imerge merge ${branch_to_be_merged}

try on your machine

explain this command
- git-imerge
git-imerge:tldr:e2d36 git-imerge: Abort imerge operation, and return to the previous branch.

$ git-imerge remove && git checkout ${previous_branch}

try on your machine

explain this command

back to context overview