X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=9c08efa53abc2797a7b7ca0e589d83b9a4387987;hb=ed82edc402c271a707da632083f1f4c19155d573;hp=bebf30ad3db951c0a0bad01ebee619821781eb39;hpb=182a8dabd5f5f646608f3857f10f3ac18c3d1445;p=git.git diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index bebf30ad3..9c08efa53 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -3,17 +3,18 @@ git-merge(1) NAME ---- -git-merge - Grand Unified Merge Driver +git-merge - Join two or more development histories together SYNOPSIS -------- -'git-merge' [-n] [--no-commit] [-s ]... ... - +[verse] +'git-merge' [-n] [--no-commit] [--squash] [-s ]... + [-m ] ... DESCRIPTION ----------- -This is the top-level user interface to the merge machinery +This is the top-level interface to the merge machinery which drives multiple merge strategy scripts. @@ -27,10 +28,11 @@ include::merge-options.txt[] to give a good default for automated `git-merge` invocations. :: - our branch head commit. + Our branch head commit. This has to be `HEAD`, so new + syntax does not require it :: - other branch head merged into our branch. You need at + Other branch head merged into our branch. You need at least one . Specifying more than one obviously means you are trying an Octopus. @@ -134,7 +136,7 @@ After seeing a conflict, you can do two things: * Resolve the conflicts. `git-diff` would report only the conflicting paths because of the above 2. and 3.. Edit the - working tree files into a desirable shape, `git-update-index` + working tree files into a desirable shape, `git-add` or `git-rm` them, to make the index file contain what the merge result should be, and run `git-commit` to commit the result.