diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-12-13 21:32:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-12-13 21:32:17 +0000 |
| commit | e7935c49199b7d60c02043382b62ce70d36017e9 (patch) | |
| tree | 280d09d89444d318008e632fbb9c9d88a393cacf /git-merge-index.html | |
| parent | 3f403b04bd95096f37297ab2cfbd4ad1f6dbb904 (diff) | |
| download | git-htmldocs-e7935c49199b7d60c02043382b62ce70d36017e9.tar.gz | |
Autogenerated HTML docs for v1.4.4.2-g1d77
Diffstat (limited to 'git-merge-index.html')
| -rw-r--r-- | git-merge-index.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-merge-index.html b/git-merge-index.html index 91fedf022..e7eeeaff0 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -325,8 +325,8 @@ files are passed as arguments 5, 6 and 7.</p> <p>If "git-merge-index" is called with multiple <file>s (or -a) then it
processes them in turn only stopping if merge returns a non-zero exit
code.</p>
-<p>Typically this is run with the a script calling the merge command from
-the RCS package.</p>
+<p>Typically this is run with the a script calling git's imitation of
+the merge command from the RCS package.</p>
<p>A sample script called "git-merge-one-file" is included in the
distribution.</p>
<p>ALERT ALERT ALERT! The git "merge object order" is different from the
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis <pasky@ucw.cz></p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 03-Oct-2006 08:41:12 UTC
+Last updated 13-Dec-2006 21:32:05 UTC
</div>
</div>
</body>
|