X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=ff088c5c294527dd97c542012483aafe3ca64314;hb=652b0bbe09c909eb5aa34be8746071f1c5c0e73d;hp=4f04bbb1aa573e7092c48add8571fb8203537412;hpb=0979c106498f21838140313b485f90faf06f454f;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 4f04bbb1a..ff088c5c2 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -36,20 +36,20 @@ OPTIONS failure usually indicates conflicts during merge). This is for porcelains which might want to emit custom messages. -If `git-merge-index` is called with multiple s (or -a) then it +If 'git-merge-index' is called with multiple s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code. Typically this is run with a script calling git's imitation of the 'merge' command from the RCS package. -A sample script called `git-merge-one-file` is included in the +A sample script called 'git-merge-one-file' is included in the distribution. ALERT ALERT ALERT! The git "merge object order" is different from the -RCS `merge` program merge object order. In the above ordering, the +RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program -`merge` is to have the original in the middle. Don't ask me why. +'merge' is to have the original in the middle. Don't ask me why. Examples: @@ -68,10 +68,10 @@ or This is added AA in the branch B. fatal: merge program failed -where the latter example shows how `git-merge-index` will stop trying to +where the latter example shows how 'git-merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus -`git-merge-index` didn't even try to merge the MM thing). +'git-merge-index' didn't even try to merge the MM thing). Author ------