rerere-autoupdate, -no-rerere-autoupdateĪllow the rerere mechanism to update the index with the result of auto-conflict resolution if possible.Ĭommits, usually other branch heads, to merge into our branch. The git fmt-merge-msg command can be used to give a good default for Set the commit message to be used for the merge commit (in case one is created). Synonyms to -stat and -no-stat these are deprecated and will be removed in the future.
Pass merge strategy specific option through to the merge strategy. Strategies is used instead ( git merge-recursive when merging a single head, git merge-octopus otherwise).
If there is no -s option, a built-in list of Use the given merge strategy can be supplied more than once to specify them in the order they should be tried. 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. This option can be used to override -squash. With -no-squash perform the merge and commit the result. This allows you to create a single commit on top of the currentīranch whose effect is the same as merging another branch (or more in case of an octopus). Nor record $GIT_DIR/MERGE_HEAD to cause the next git commit command to create a merge commit. 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 or move the HEAD, With -n or -no-stat do not show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat. With -no-log do not list one-line descriptions from the actual commits being merged. In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being merged. With -no-ff Generate a merge commit even if the merge resolved as a fast-forward.
This is the default behavior of git-merge. 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ĭo not generate a merge commit if the merge resolved as a fast-forward, only update the branch pointer. This option can be used to override -no-commit. Warning: Running git merge with uncommitted changes is discouraged: while possible, it leaves you in a state that is hard to back out of in Do not use it from the command line or in new scripts. 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.ĭ-E-F-G-H master The second syntax ( HEAD. This command is usedīy git pull to incorporate changes from another repository and can be used by hand to merge changes from one branch into another.Īssume the following history exists and the current branch is "master":ĭ-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 Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch. Git-merge - Join two or more development histories together
0 kommentar(er)
