mirror of
https://github.com/git-for-windows/git.git
synced 2025-12-13 08:41:13 -06:00
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>
This commit is contained in:
parent
5ea55edb68
commit
f1c3239ab5
4
INSTALL
4
INSTALL
@ -79,8 +79,8 @@ Issues of note:
|
|||||||
- "perl" and POSIX-compliant shells are needed to use most of
|
- "perl" and POSIX-compliant shells are needed to use most of
|
||||||
the barebone Porcelainish scripts.
|
the barebone Porcelainish scripts.
|
||||||
|
|
||||||
- "cpio" is used by git-merge for saving and restoring the index,
|
- "cpio" is used by git-clone when doing a local (possibly
|
||||||
and by git-clone when doing a local (possibly hardlinked) clone.
|
hardlinked) clone.
|
||||||
|
|
||||||
- Some platform specific issues are dealt with Makefile rules,
|
- Some platform specific issues are dealt with Makefile rules,
|
||||||
but depending on your specific installation, you may not
|
but depending on your specific installation, you may not
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user