X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=b726ddfe125f54986dad4c0f19c53d657de082b5;hb=7481ebe9918771a9269c7fd0e91e855f18f2bc52;hp=b8ee1ff2b0681ea9fbc83618b1d09d95f3a902ff;hpb=070739fd351702ea9bb4f65595728ae25a488075;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index b8ee1ff2b..b726ddfe1 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -40,7 +40,7 @@ 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 git's imitation of +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 @@ -59,7 +59,7 @@ Examples: This is modified MM in the branch B. # merge2 This is modified MM in the branch B. # current contents -or +or torvalds@ppc970:~/merge-test> git-merge-index cat AA MM cat: : No such file or directory @@ -85,4 +85,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list