Merging
suggest changeSyntax
git mergeanother_branch[options]git merge–abort
| Parameter | Details |
|---|---|
| -m | Message to be included in the merge commit |
| -v | Show verbose output |
| --abort | Attempt to revert all files back to their state |
| --ff-only | Aborts instantly when a merge-commit would be required |
| --no-ff | Forces creation of a merge-commit, even if it wasn’t mandatory |
| --no-commit | Pretends the merge failed to allow inspection and tweaking of the result |
| --stat | Show a diffstat after merge completion |
| -n/--no-stat | Don’t show the diffstat |
| --squash | Allows for a single commit on the current branch with the merged changes |
Found a mistake? Have a question or improvement idea?
Let me know.
Table Of Contents
4 Undoing
5 Staging
6 Git diff
7 Merging
10 Submodules
11 Aliases
12 Rebasing
14 Branching
15 rev-list
16 Squashing
18 Recovering
19 git clean
21 .mailmap
23 Pulling
24 Hooks
26 Stashing
27 Subtrees
28 Renaming
29 Pushing
30 Internals
31 git-tfs
33 git-svn
34 Archive
37 Show
39 Bundles
42 Blaming
44 Worktrees
45 Git remote
47 git patch
52 TortoiseGit
57 Git rerer
59 git tagging
61 diff tree
62 Contributors