Getting started
Committing
Browsing the history
Undoing
Staging
Git diff
Merging
Syntax
Automatic merging
Merge one branch into another
Aborting a merge
Keep changes from only one side of a merge
Merge with a commit
Finding all branches with no merged changes
Ignoring files and folders
Working with remotes
Submodules
Aliases
Rebasing
Configuration
Branching
rev-list
Squashing
Cherry picking
Recovering
git clean
.gitattributes
.mailmap
Different workflows
Pulling
Hooks
Cloning repositories
Stashing
Subtrees
Renaming
Pushing
Internals
git-tfs
Empty directories in git
git-svn
Archive
Rewriting history with filter-branc
Migrating to git
Show
Resolving merge conflicts
Bundles
Display commit history graphically with gitk
Bisecting to find faulty commits
Blaming
Git revisions syntax
Worktrees
Git remote
Git large file storage
git patch
git statistics
git send-email
git gui clients
reflog - restoring commits not shown in git log
TortoiseGit
External merge and diff tools
Update object name in reference
Git branch name on Bash Ubuntu
Git client-side hooks
Git rerer
Change git repository name
git tagging
tidying up your local and remote repository
diff tree
Contributors

Merging

suggest change

Syntax

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

Feedback about page:

Feedback:
Optional: your email if you want me to get back to you:



Table Of Contents