back to context overview

git-merge

List of commands for git-merge:

- git
git-merge:tldr:4d3c9 git-merge: Edit the merge message.

$ git merge --edit ${branch_name}

try on your machine

explain this command
- git
git-merge:tldr:6526d git-merge: Merge a branch into your current branch.

$ git merge ${branch_name}

try on your machine

explain this command
- git
git-merge:tldr:6ae4c git-merge: Abort a merge in case of conflicts.

$ git merge --abort

try on your machine

explain this command
- git
git-merge:tldr:a1d81 git-merge: Merge a branch and create a merge commit.

$ git merge --no-ff ${branch_name}

try on your machine

explain this command
- git
git-merge:tldr:db97f git-merge: Merge using a specific strategy.

$ git merge --strategy ${strategy} --strategy-option ${strategy_option} ${branch_name}

try on your machine

explain this command

back to context overview