From: Gerrit Pape <pape@smarden.org>
Date: Wed, 6 Feb 2008 07:03:53 +0000 (+0000)
Subject: INSTALL: git-merge no longer uses cpio
X-Git-Tag: v1.5.4.1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f1c3239ab5c4d66637822b03db407f87ed068d15;p=git.git

INSTALL: git-merge no longer uses cpio

Since a64d7784e830b3140e7d0f2b45cb3d8fafb84cca git merge doesn't use cpio
anymore, adapt the documentation.

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/INSTALL b/INSTALL
index f1eb4049b..6f3bcb452 100644
--- a/INSTALL
+++ b/INSTALL
@@ -79,8 +79,8 @@ Issues of note:
 	- "perl" and POSIX-compliant shells are needed to use most of
 	  the barebone Porcelainish scripts.
 
-	- "cpio" is used by git-merge for saving and restoring the index,
-	  and by git-clone when doing a local (possibly hardlinked) clone.
+	- "cpio" is used by git-clone when doing a local (possibly
+	  hardlinked) clone.
 
  - Some platform specific issues are dealt with Makefile rules,
    but depending on your specific installation, you may not