GIT-MERGE(1)                                Git Manual                               GIT-MERGE(1)

       git-merge - Join two or more development histories together

       git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
               [-s ] [-X ] [-S[]]
               [--[no-]rerere-autoupdate] [-m ] [...]
       git merge  HEAD ...
       git merge --abort

       Incorporates changes from the named commits (since the time their histories diverged from
       the current branch) into the current branch. This command is used by git pull to
       incorporate changes from another repository and can be used by hand to merge changes from
       one branch into another.

       Assume the following history exists and the current branch is "master":

                     A---B---C topic
               D---E---F---G master

       Then "git merge topic" will replay the changes made on the topic branch since it diverged
       from master (i.e., E) until its current commit (C) on top of master, and record the result
       in a new commit along with the names of the two parent commits and a log message from the
       user describing the changes.

                     A---B---C topic
                    /         \
               D---E---F---G---H master

       The second syntax ( HEAD ...) is supported for historical reasons. Do not use
       it from the command line or in new scripts. It is the same as git merge -m 

       The third syntax ("git merge --abort") can only be run after the merge has resulted in
       conflicts. git merge --abort will abort the merge process and try to reconstruct the
       pre-merge state. However, if there were uncommitted changes when the merge started (and
       especially if those changes were further modified after the merge was started), git merge
       --abort will in some cases be unable to reconstruct the original (pre-merge) changes.

       Warning: Running git merge with non-trivial uncommitted changes is discouraged: while
       possible, it may leave you in a state that is hard to back out of in the case of a

       --commit, --no-commit
           Perform the merge and commit the result. This option can be used to override

           With --no-commit perform the merge but pretend the merge failed and do not autocommit,
           to give the user a chance to inspect and further tweak the merge result before

       --edit, -e, --no-edit
           Invoke an editor before committing successful mechanical merge to further edit the
           auto-generated merge message, so that the user can explain and justify the merge. The
           --no-edit option can be used to accept the auto-generated message (this is generally
           discouraged). The --edit (or -e) option is still useful if you are giving a draft
           message with the -m option from the command line and want to edit it in the editor.

           Older scripts may depend on the historical behaviour of not allowing the user to edit
           the merge log message. They will see an editor opened when they run git merge. To make
           it easier to adjust such scripts to the updated behaviour, the environment variable
           GIT_MERGE_AUTOEDIT can be set to no at the beginning of them.

           When the merge resolves as a fast-forward, only update the branch pointer, without
           creating a merge commit. This is the default behavior.

           Create a merge commit even when the merge resolves as a fast-forward. This is the
           default behaviour when merging an annotated (and possibly signed) tag.

           Refuse to merge and exit with a non-zero status unless the current HEAD is already
           up-to-date or the merge can be resolved as a fast-forward.

       --log[=], --no-log
           In addition to branch names, populate the log message with one-line descriptions from
           at most  actual commits that are being merged. See also git-fmt-merge-msg(1).

           With --no-log do not list one-line descriptions from the actual commits being merged.

       --stat, -n, --no-stat
           Show a diffstat at the end of the merge. The diffstat is also controlled by the
           configuration option merge.stat.

           With -n or --no-stat do not show a diffstat at the end of the merge.

       --squash, --no-squash
           Produce the working tree and index state as if a real merge happened (except for the
           merge information), but do not actually make a commit, move the HEAD, or record
           $GIT_DIR/MERGE_HEAD (to cause the next git commit command to create a merge commit).
           This allows you to create a single commit on top of the current branch whose effect is
           the same as merging another branch (or more in case of an octopus).

           With --no-squash perform the merge and commit the result. This option can be used to
           override --squash.

       -s , --strategy=
           Use the given merge strategy; can be supplied more than once to specify them in the
           order they should be tried. If there is no -s option, a built-in list of strategies is
           used instead (git merge-recursive when merging a single head, git merge-octopus



Designed by SanjuD(@ngineerbabu)