Copy script explanations into Makefile.

I always confuse fixup and update.  Now I only have to read one file
to refresh my memory.

diff --git a/Makefile b/Makefile
index 8148548d01e70c554c913aa0a7b6541e35800404..bf3e2c0942276e5f10d05b5278969852c50bce9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,18 +17,20 @@ clean:
 diff:
        git diff
 
+# Link each _FILE in the current directory to ~/.FILE
 fixup: update
        ./fixup.sh
 
-update:
-       ./update.sh
-
-merge:
-       ./merge.sh
-
+# By default, fixup only replaces missing files and simlinks.  You can
+# optionally overwrite any local files and directories by passing the
+# --force option.
 override:
        ./fixup.sh --force
 
+# Get the current dotfiles from the server using a variety of methods.
+update:
+       ./update.sh
+
 # Print a diff between the local installation and .dotfiles
 # i.e. What changes will `make override' effect
 localdiff: