git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] INSTALL: git-merge no longer uses cpio
@ 2008-02-06  7:03 Gerrit Pape
  2008-02-06 22:46 ` Johannes Schindelin
  0 siblings, 1 reply; 3+ messages in thread
From: Gerrit Pape @ 2008-02-06  7:03 UTC (permalink / raw)
  To: git, Junio C Hamano

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

Signed-off-by: Gerrit Pape <pape@smarden.org>
---
 INSTALL |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index f1eb404..6f3bcb4 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
-- 
1.5.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-02-06 22:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-06  7:03 [PATCH] INSTALL: git-merge no longer uses cpio Gerrit Pape
2008-02-06 22:46 ` Johannes Schindelin
2008-02-06 22:55   ` Mike Hommey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).