Refactor merge strategies into separate includable file.

[git.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 14580cc..bbb13f3 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -46,6 +46,9 @@ Issues of note:
          transfer, you are probabaly OK if you do not have
          them.
 
+       - expat library; git-http-push uses it for remote lock
+         management over DAV.  Similar to "curl" above, this is optional.
+
        - "GNU diff" to generate patches.  Of course, you don't _have_ to
          generate patches if you don't want to, but let's face it, you'll
          be wanting to. Or why did you get git in the first place?
@@ -64,3 +67,8 @@ Issues of note:
          You'll only need the merge program if you do development using
          git, and if you only use git to track other peoples work you'll
          never notice the lack of it. 
+
+        - "wish", the TCL/Tk windowing shell is used in gitk to show the
+          history graphically
+
+       - "ssh" is used to push and pull over the net