diff options
author | Gerrit Pape <pape@smarden.org> | 2008-02-06 07:03:53 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-05 23:31:17 -0800 |
commit | f1c3239ab5c4d66637822b03db407f87ed068d15 (patch) | |
tree | 24b4422ba3ccb9cb82fdc81beec432f87849b268 /INSTALL | |
parent | 5ea55edb68f488fad76c007472830cc649e3d320 (diff) | |
download | git-f1c3239ab5c4d66637822b03db407f87ed068d15.tar.gz |
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-- | INSTALL | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |