X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=b8ee1ff2b0681ea9fbc83618b1d09d95f3a902ff;hb=fa736f72b0840950e32dfd8bc470e91831107b10;hp=6cd060108292733725aca28cc8f0b83aa7d0f56e;hpb=f0679f474a884df13ce032d81dde34175c0fa343;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 6cd060108..b8ee1ff2b 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -3,7 +3,7 @@ git-merge-index(1) NAME ---- -git-merge-index - Runs a merge for files needing merging +git-merge-index - Run a merge for files needing merging SYNOPSIS @@ -40,8 +40,8 @@ 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 the a script calling the merge command from -the RCS package. +Typically this is run with the 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 distribution.