Run a merge for files needing merging NAME git-merge-index - Run a merge for files needing merging SY...Run merge conflict resolution tools to resolve merge conflicts NAME git-mergetool - Run merge confl...Common Git merge tool shell scriptlets NAME git-mergetool--lib - Common Git merge tool shell scriptlets SY...Produce a merge commit message NAME git-fmt-merge-msg - Produce a merge commit message SYNOPSIS git fmt-m...Reuse recorded resolution of conflicted merges NAME git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS git rerere [cl...Merge subtrees together and split repository into subtrees NAME git-subtree - Merge subtrees to...Perform merge without touching index or working tree NAME git-merge-tree - Perform merge without touchi...Run a three-way file merge NAME git-merge-file - Run a three-way file merge SYNOPSIS git merge-file [-L <current-nam...Find as good common ancestors as possible for a merge NAME git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS git...The standard helper program to use with git-merge-index NAME git-merge-one-file - The standard helper program to use with git-merge-index S...Join two or more development histories together NAME git-merge - Join two or more development histories together SYNOPSIS git merge [-n] [--stat] [--no-......[-v [--abbrev=<n> | --no-abbrev]] [--column[=<options>] | --no-column] [--sort=<key>] [--merged [<commit>]] [--no-merged [<commit>]] [--contains [<commit>]] [--no-contains [<com…...it. -t <tool>, --tool=<tool> Use the diff tool specified by <tool>. Valid values include emerge, kompare, meld, and vimdiff. Run git difftool --tool-help for the list of valid <…...s edit [--allow-empty] [<object>] [--[no-]stripspace] git notes show [<object>] git notes merge [-v | -q] [-s <strategy> ] <notes-ref> git notes merge --commit [-v | -q] git not…Get and set repository or global options NAME git-config - Get and set repository or global options SYNOPSIS git config list [<file-option>] [<display-option>] [--includes] git con…...ending on configuration options or command line flags, will call either git rebase or git merge to reconcile diverging branches. <repository> should be the name of a remote repo…...ream> is not specified, the upstream configured in branch.<name>.remote and branch.<name>.merge options will be used (see git-config (1) for details) and the --fork-point option…...lly update any of the files it "caches". (see: git-checkout-index (1)) Optionally, it can merge a tree into the index, perform a fast-forward (i.e. 2-way) merge, or a 3-way merg…...HEAD ^origin Another special notation is " <commit1> ... <commit2> " which is useful for merges. The resulting set of commits is the symmetric difference between the two operand…...n will cause it to die. --remove-empty Stop when a given path disappears from the tree. --merges Print only merge commits. This is exactly the same as --min-parents=2 . --no-mer…