From 7dd842111c77bfb3ba1f8d69a2ba312a7f665460 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 1 Jun 2010 13:55:36 -0400 Subject: [PATCH] Copy script explanations into Makefile. I always confuse fixup and update. Now I only have to read one file to refresh my memory. --- Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8148548..bf3e2c0 100644 --- 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: -- 2.26.2