summaryrefslogtreecommitdiff
path: root/INSTALL
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-06 14:20:15 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-06 14:20:15 -0800
commitb828fef678c21d017f18d2094bfdaac94e5fbf7a (patch)
tree9aca1a08f3bdcde70d2de9a32ef0360b89b0a053 /INSTALL
parente62a641de17b172ffc4d3a803085c8afbfbec3d1 (diff)
parenta0cf49c16ae37177dcfcefa1149bf09f84721cf5 (diff)
downloadgit-b828fef678c21d017f18d2094bfdaac94e5fbf7a.tar.gz
Merge branch 'maint'
* maint: Fix parsing numeric color values INSTALL: git-merge no longer uses cpio
Diffstat (limited to 'INSTALL')
-rw-r--r--INSTALL4
1 files changed, 2 insertions, 2 deletions
diff --git a/INSTALL b/INSTALL
index f1eb4049b9..6f3bcb4525 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