Git
  • About
    • Trademark
  • Learn
    • Book
    • Cheat Sheet
    • Videos
    • External Links
  • Tools
    • Command Line
    • GUIs
    • Hosting
  • Reference
  • Install
  • Community
  • Table of Contents
    • NAME
    • SYNOPSIS
    • DESCRIPTION
    • OPTIONS
    • PRE-MERGE CHECKS
    • FAST-FORWARD MERGE
    • TRUE MERGE
    • MERGING TAG
    • HOW CONFLICTS ARE PRESENTED
    • HOW TO RESOLVE CONFLICTS
    • EXAMPLES
    • MERGE STRATEGIES
    • CONFIGURATION
    • SEE ALSO
    • GIT
English ▾
Localized versions of git-merge manual
  1. English
  2. Français
  3. Português (Brasil)
  4. Русский
  5. Svenska
  6. українська мова
  7. 简体中文
Want to read in your language or fix typos?
You can help translate this page.
Topics ▾

Setup and Config

  • git
  • config
  • help
  • bugreport
  • Credential helpers

Getting and Creating Projects

  • init
  • clone

Basic Snapshotting

  • add
  • status
  • diff
  • commit
  • notes
  • restore
  • reset
  • rm
  • mv

Branching and Merging

  • branch
  • checkout
  • switch
  • merge
  • mergetool
  • log
  • stash
  • tag
  • worktree

Sharing and Updating Projects

  • fetch
  • pull
  • push
  • remote
  • submodule

Inspection and Comparison

  • show
  • log
  • diff
  • difftool
  • range-diff
  • shortlog
  • describe

Patching

  • apply
  • cherry-pick
  • diff
  • rebase
  • revert

Debugging

  • bisect
  • blame
  • grep

Email

  • am
  • apply
  • imap-send
  • format-patch
  • send-email
  • request-pull

External Systems

  • svn
  • fast-import

Server Admin

  • daemon
  • update-server-info

Guides

  • gitattributes
  • Command-line interface conventions
  • Everyday Git
  • Frequently Asked Questions (FAQ)
  • Glossary
  • Hooks
  • gitignore
  • gitmodules
  • Revisions
  • Submodules
  • Tutorial
  • Workflows
  • All guides...

Administration

  • clean