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>
Gerrit Pape committed
Feb 6, 2008 at 07:03 UTC
f1c3239ab5c4d66637822b03db407f87ed068d15
1 file changed
+2
-2
INSTALL
+2
-2
@@ -79,8 +79,8 @@ Issues of note:
79
- "perl" and POSIX-compliant shells are needed to use most of
80
the barebone Porcelainish scripts.
81
82
- - "cpio" is used by git-merge for saving and restoring the index,
83
- and by git-clone when doing a local (possibly hardlinked) clone.
82
+ - "cpio" is used by git-clone when doing a local (possibly
83
+ hardlinked) clone.
84
85
- Some platform specific issues are dealt with Makefile rules,
86
but depending on your specific installation, you may not