Run a merge for files needing merging NAME git-merge-index - Run a merge for files needing merging SYNOPSIS git merge-index [-o] [-q] <merge-program> (-a | ( [--] <file>...) ) DESC…Join two or more development histories together NAME git-merge - Join two or more development histories together SYNOPSIS git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]e…Run merge conflict resolution tools to resolve merge conflicts NAME git-mergetool - Run merge conflict resolution tools to resolve merge conflicts SYNOPSIS git mergetool [--tool=<t…Common Git merge tool shell scriptlets NAME git-mergetool--lib - Common Git merge tool shell scriptlets SYNOPSIS TOOL_MODE=(diff|merge) . "$(git --exec-path)/git-mergetool--lib" DE…List, create, or delete branches NAME git-branch - List, create, or delete branches SYNOPSIS git branch [--color[=<when>] | --no-color] [--show-current] [-v [--abbrev=<n> | --no-ab…Produce a merge commit message NAME git-fmt-merge-msg - Produce a merge commit message SYNOPSIS git fmt-merge-msg [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log] git…Show changes using common diff tools NAME git-difftool - Show changes using common diff tools SYNOPSIS git difftool [<options>] [<commit> [<commit>]] [--] [<path>...] DESCRIPTION g…Reuse recorded resolution of conflicted merges NAME git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS git rerere [clear | forget <pathspec>... | diff | status | …Add or inspect object notes NAME git-notes - Add or inspect object notes SYNOPSIS git notes [list [<object>]] git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<pa…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…Merge subtrees together and split repository into subtrees NAME git-subtree - Merge subtrees together and split repository into subtrees SYNOPSIS git subtree [<options>] -P <prefix…Perform merge without touching index or working tree NAME git-merge-tree - Perform merge without touching index or working tree SYNOPSIS git merge-tree [--write-tree] [<options>] <…Run a three-way file merge NAME git-merge-file - Run a three-way file merge SYNOPSIS git merge-file [-L <current-name> [-L <base-name> [-L <other-name>]]] [--ours|--theirs|--union]…Fetch from and integrate with another repository or a local branch NAME git-pull - Fetch from and integrate with another repository or a local branch SYNOPSIS git pull [<options>] …Reapply commits on top of another base tip NAME git-rebase - Reapply commits on top of another base tip SYNOPSIS git rebase [-i | --interactive] [<options>] [--exec <cmd>] [--onto …Reads tree information into the index NAME git-read-tree - Reads tree information into the index SYNOPSIS git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix…Show commit logs NAME git-log - Show commit logs SYNOPSIS git log [<options>] [<revision-range>] [[--] <path>...] DESCRIPTION Shows the commit logs. List commits that are reachable…Summarize 'git log' output NAME git-shortlog - Summarize 'git log' output SYNOPSIS git shortlog [<options>] [<revision-range>] [[--] <path>...] git log --pretty=short | git shortlo…EXPERIMENTAL: Replay commits on a new base, works with bare repos too NAME git-replay - EXPERIMENTAL: Replay commits on a new base, works with bare repos too SYNOPSIS (EXPERIMENTAL…Lists commit objects in reverse chronological order NAME git-rev-list - Lists commit objects in reverse chronological order SYNOPSIS git rev-list [<options>] <commit>... [--] [<pat…