NAME git-merge - Join two or more development histories together SYNOPSIS git merge [-n] [--stat ... rerere-autoupdate] [-m ] [-F ] [--into-name ] [ ...] git merge (--continue |…upstream configured in branch. .remote and branch. .merge options will be used (see git-config ... skipped). It is possible that a merge failure will prevent this process from bein…will call either git rebase or git merge to reconcile diverging branches. should ... read from the "remote" and "merge" configuration for the current branchequivalent: $ git log A B --not $(git merge-base ... notes. .mergeStrategy Which merge strategy to choose when doing a notes merge into refs/notes/ . ThisNAME git-merge-tree - Perform merge without touching index or working tree SYNOPSIS git merge ... tree [--write-tree] [ ] git merge-tree [--trivial-merge] (deprecated) DE…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 merge, with the -m flag. WhenNAME git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS ... merge-base [-a | --all] ... git merge-base [-a | --all] --octopus ... git merge-base --…NAME git-mergetool - Run merge conflict resolution tools to resolve merge conflicts SYNOPSIS git mergetool ... mergetool to run one of several merge utilities to resolve merge conf…list A B --not $(git merge-base --all A B) $ git rev-list ... disappears from the tree. --merges Print only merge commits. This is exactly the samedisappears from the tree. --merges Print only merge commits. This is exactly the same ... first parent commit upon seeing a merge commit. This option can give a better overviewdisappears from the tree. --merges Print only merge commits. This is exactly the same ... first parent commit upon seeing a merge commit. This option can give a better overviewSYNOPSIS git diff [ ] [ ] [--] [ ...] git diff [ ] --cached [--merge-base] [ ] [--] [ ...] git diff [ ] [--merge-base] [ ...] [--] [ ...] git diff ... between two trees, change…stripspace] git notes show [ ] git notes merge [-v | -q] [-s ] git notes merge --commit ... notes merge --abort [-v | -q] git notes remove [--ignore-missing] [--stdin] [ ...] g…NAME git-subtree - Merge subtrees together and split repository into subtrees SYNOPSIS git subtree ... subtree [ ] -P add git subtree [ ] -P merge [ ] git subtree [ ] -P …working tree files upon merge. The default is "merge", which shows a <<<<<<< conflict marker, changes ... merge driver. See gitattributes (5) for details. merge. .recursive Names a…NAME git-merge-index - Run a merge for files needing merging SYNOPSIS git merge-index ... index and, if there are any merge entries, passes the SHA-1 hash for thosehand resolve results on the initial manual merge, and applying previously recorded hand resolutions ... metadata used by rerere if a merge resolution is to be aborted. Callingreset [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [ ] DESCRIPTION In the first three forms, copy ... writing any tracked files are simply deleted. --merge Resets the i…NAME git-merge-file - Run a three-way file merge SYNOPSIS git merge-file ... DESCRIPTION Given three files , and , git merge-file incorporates all changes that lead fromtextual diff. It also presents the merge commit in a special format as produced ... PRETTY FORMATS If the commit is a merge, and if the pretty-format