diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-10-31 04:03:55 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-10-31 04:03:55 +0000 |
| commit | c21ab059d7d4dcad19afc93fc1499e8a9b97fd7a (patch) | |
| tree | e089d48d0f6440fa50436a1e9ad275bd4556332e /git-merge.txt | |
| parent | 621e123b886211db461d69906b1e7c184c37263e (diff) | |
| download | git-htmldocs-c21ab059d7d4dcad19afc93fc1499e8a9b97fd7a.tar.gz | |
Autogenerated HTML docs for v1.6.5.2-140-g5f809
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/git-merge.txt b/git-merge.txt index d05f32446..e886c2ef5 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -212,6 +212,39 @@ You can work through the conflict with a number of tools: common ancestor, 'git show :2:filename' shows the HEAD version and 'git show :3:filename' shows the remote version. + +EXAMPLES +-------- + +* Merge branches `fixes` and `enhancements` on top of + the current branch, making an octopus merge: ++ +------------------------------------------------ +$ git merge fixes enhancements +------------------------------------------------ + +* Merge branch `obsolete` into the current branch, using `ours` + merge strategy: ++ +------------------------------------------------ +$ git merge -s ours obsolete +------------------------------------------------ + +* Merge branch `maint` into the current branch, but do not make + a new commit automatically: ++ +------------------------------------------------ +$ git merge --no-commit maint +------------------------------------------------ ++ +This can be used when you want to include further changes to the +merge, or want to write your own merge commit message. ++ +You should refrain from abusing this option to sneak substantial +changes into a merge commit. Small fixups like bumping +release/version name would be acceptable. + + SEE ALSO -------- linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], |