summaryrefslogtreecommitdiff
path: root/INSTALL
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2008-02-06 07:03:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-06 07:31:17 (GMT)
commitf1c3239ab5c4d66637822b03db407f87ed068d15 (patch)
tree24b4422ba3ccb9cb82fdc81beec432f87849b268 /INSTALL
parent5ea55edb68f488fad76c007472830cc649e3d320 (diff)
downloadgit-f1c3239ab5c4d66637822b03db407f87ed068d15.zip
git-f1c3239ab5c4d66637822b03db407f87ed068d15.tar.gz
git-f1c3239ab5c4d66637822b03db407f87ed068d15.tar.bz2
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>
Diffstat (limited to 'INSTALL')
-rw-r--r--INSTALL4
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