diff --git a/test/run-tests.sh b/test/run-tests.sh
index a29c2fb5f4111501833c28afdf07af18d16a2a48..bff1c3cedc797b3a0129e193180a3d66cd3021c2 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -84,12 +84,12 @@ elif [ "$lisp" = "clisp" ] ; then
 elif [ "$lisp" = "allegro" ] ; then
     if type alisp ; then
 	fasl_ext="fasl"
-	command="alisp -q --batch "
+	command="alisp -q -batch "
     fi
 elif [ "$lisp" = "allegromodern" ] ; then
     if type mlisp ; then
 	fasl_ext="fasl"
-	command="mlisp -q --batch "
+	command="mlisp -q -batch "
     fi
 elif [ "$lisp" = "ccl" ] ; then
     if type ccl ; then
diff --git a/test/script-support.lisp b/test/script-support.lisp
index 64f482b91f8f03366b952a76ed29c479ecc8b5cc..46540fd437136dc10bf06c9de30b41f45f5aba1d 100644
--- a/test/script-support.lisp
+++ b/test/script-support.lisp
@@ -27,7 +27,7 @@
 
   (error "Don't know how to quit Lisp; wanting to use exit code ~a" return))
 
-(defmacro exit-on-error (&body body)
+(defmacro quit-on-error (&body body)
   `(handler-case 
       (progn ,@body
 	     (leave-lisp "Script succeeded" 0))
diff --git a/test/test-force.script b/test/test-force.script
index 02612190e8e69d1d4bea7600eada313a2954cd50..4d211c66caff5c61968ba4fd46b362f83d39197a 100644
--- a/test/test-force.script
+++ b/test/test-force.script
@@ -1,12 +1,13 @@
 ;;; -*- Lisp -*-
 (load "script-support")
 (load "../asdf")
-(exit-on-error 
+(quit-on-error 
  (setf asdf:*central-registry* '(*default-pathname-defaults*))
 
  (asdf:operate 'asdf:load-op 'test-force)
- (defvar file1-date (file-write-date (compile-file-pathname "file1")))
+ (defvar file1-date (file-write-date (compile-file-pathname "file1"))))
 
+(quit-on-error 
  ;; unforced, date should stay same
  (sleep 1)
  (asdf:operate 'asdf:load-op 'test-force)
diff --git a/test/test-nested-components.script b/test/test-nested-components.script
index 44ebe360af87083a5b7530f2fda45da6daff619c..0ec92eb1992ccd53c2a9500943c51c612deaa48c 100644
--- a/test/test-nested-components.script
+++ b/test/test-nested-components.script
@@ -6,7 +6,7 @@
 (load "../asdf")
 (in-package #:common-lisp-user)
 
-(exit-on-error 
+(quit-on-error 
  (setf asdf:*central-registry* nil)
  (load (merge-pathnames "test-nested-components-1.asd"))
  (print 
diff --git a/test/test-package.script b/test/test-package.script
index a452a8fd778d951b6cadf016cb653fd2a7eded5e..7fe534d673497a6388fdc51fc0739c79270dd173 100644
--- a/test/test-package.script
+++ b/test/test-package.script
@@ -2,7 +2,7 @@
 ;;; -*- Lisp -*-
 (load "script-support")
 (load "../asdf")
-(exit-on-error 
+(quit-on-error 
 
  (defun module () 1)
 
diff --git a/test/test-retry-loading-component-1.script b/test/test-retry-loading-component-1.script
index a445cf0156be0407e4d50fd9d08d69b0c6c4fb7e..995ef442c9684d9639e5d23f9ebdd00ee0310efa 100644
--- a/test/test-retry-loading-component-1.script
+++ b/test/test-retry-loading-component-1.script
@@ -9,7 +9,7 @@
 ;#+allegro
 ;(trace excl.osi:command-output)
 (defvar *caught-error* nil)
-(exit-on-error 
+(quit-on-error 
  (when (probe-file "try-reloading-dependency.asd")
    (asdf:run-shell-command "rm -f ~A"
 			   (namestring "try-reloading-dependency.asd")))
diff --git a/test/test-static-and-serial.script b/test/test-static-and-serial.script
index a61f0da9fde7952b30117d299f98dc916f3e63cc..cd100f034cef0532e5d4505aa3c545789b550224 100644
--- a/test/test-static-and-serial.script
+++ b/test/test-static-and-serial.script
@@ -1,12 +1,13 @@
 ;;; -*- Lisp -*-
 (load "script-support")
 (load "../asdf")
-(exit-on-error 
+(quit-on-error 
  (setf asdf:*central-registry* '(*default-pathname-defaults*))
 
  (asdf:operate 'asdf:load-op 'static-and-serial)
- (defvar file1-date (file-write-date (compile-file-pathname "file1")))
+ (defvar file1-date (file-write-date (compile-file-pathname "file1"))))
 
+(quit-on-error 
  ;; cheat
  (setf asdf::*defined-systems* (make-hash-table :test 'equal))
   
diff --git a/test/test-touch-system-1.script b/test/test-touch-system-1.script
index 7c3aa3abdc24d0b07fb8f07bde55979fedc776c3..356c7a912cf5ad35372fce56fd4322c8af491a41 100644
--- a/test/test-touch-system-1.script
+++ b/test/test-touch-system-1.script
@@ -5,7 +5,7 @@
 
 (load "script-support")
 (load "../asdf")
-(exit-on-error 
+(quit-on-error 
  (flet ((system-load-time (name)
 	  (let ((data (asdf::system-registered-p name)))
 	    (when data
diff --git a/test/test-touch-system-2.script b/test/test-touch-system-2.script
index 82511d2e0877e3f798424ce251340458cae509ad..56d5d829b8a9cdee430d14b607a2bebd196cc37a 100644
--- a/test/test-touch-system-2.script
+++ b/test/test-touch-system-2.script
@@ -5,7 +5,7 @@
 
 (load "script-support")
 (load "../asdf")
-(exit-on-error 
+(quit-on-error 
  (flet ((system-load-time (name)
 	  (let ((data (asdf::system-registered-p name)))
 	    (when data
diff --git a/test/test-try-recompiling-1.script b/test/test-try-recompiling-1.script
index e6630cc39cf6c12ec9ffe2b649ffc3a39eee414b..5ee2ccb173921498f49a8dfd197b55f8567ee70f 100644
--- a/test/test-try-recompiling-1.script
+++ b/test/test-try-recompiling-1.script
@@ -4,11 +4,12 @@
 
 (load "script-support")
 (load "../asdf")
-(exit-on-error 
+(defvar *caught-error* nil)
+
+(quit-on-error 
  (asdf:run-shell-command "rm -f ~A"
 			 (namestring 
 			  (compile-file-pathname "try-recompiling-1")))
- (defvar *caught-error* nil)
  (setf asdf:*central-registry* '(*default-pathname-defaults*))
  (handler-bind ((error (lambda (c) 
 			 (setf *caught-error* t)
diff --git a/test/test-version.script b/test/test-version.script
index 76dbef279bfc481722ce6487aded31380071ed6e..5b4497c1c87c6a928146e647429d12f4090d5fcb 100644
--- a/test/test-version.script
+++ b/test/test-version.script
@@ -8,7 +8,7 @@
 
 (in-package :test-version-system)
 
-(cl-user::exit-on-error 
+(cl-user::quit-on-error 
  (defsystem :versioned-system-1
    :pathname #.*default-pathname-defaults*
    :version "1.0")
diff --git a/test/test1.script b/test/test1.script
index 723b4a5b229d92f9cff4baa70bbd923bafd091e9..b6f2fc9e7ee00aaaea46ed8cd5afe3e8c6a1e33d 100644
--- a/test/test1.script
+++ b/test/test1.script
@@ -1,18 +1,20 @@
 ;;; -*- Lisp -*-
 (load "script-support")
 (load "../asdf")
-(exit-on-error 
+(quit-on-error 
  (setf asdf:*central-registry* '(*default-pathname-defaults*))
  (asdf:operate 'asdf:load-op 'test1)
 
  ;; test that it compiled
- (defvar file1-date (file-write-date (compile-file-pathname "file1")))
+ (defvar file1-date (file-write-date (compile-file-pathname "file1"))))
+
+(quit-on-error 
  (assert (and file1-date (file-write-date (compile-file-pathname "file2")))))
 
 ;; and loaded
 (assert test-package::*file1*)
 
-(exit-on-error 
+(quit-on-error 
  ;; now remove one output file and check that the other is _not_
  ;; recompiled
  (sleep 1) ; mtime has 1-second granularity, so pause here for fast machines
diff --git a/test/test2.script b/test/test2.script
index 0ac277f2956c53884718badd4c5a6af1a7ec1c31..781fd3178266946a869fb4ff07a69162cc20b1ac 100644
--- a/test/test2.script
+++ b/test/test2.script
@@ -1,7 +1,7 @@
 ;;; -*- Lisp -*-
 (load "script-support")
 (load "../asdf")
-(exit-on-error 
+(quit-on-error 
  (setf asdf:*central-registry* '(*default-pathname-defaults*))
 					;(trace asdf::perform)
 					;(trace asdf::find-component)
@@ -13,10 +13,14 @@
      (asdf:oos 'asdf:load-op 'test2b2)
    (asdf:missing-dependency (c)
      (format t "load failed as expected: - ~%~A~%" c))
-   (:no-error (c) (error "should have failed, oops")))
+   (:no-error (c)
+     (declare (ignore c))
+     (error "should have failed, oops")))
  (handler-case 
      (asdf:oos 'asdf:load-op 'test2b3)
    (asdf:missing-dependency (c)
      (format t "load failed as expected: - ~%~A~%" c))
-   (:no-error (c) (error "should have failed, oops")))
+   (:no-error (c) 
+     (declare (ignore c))
+     (error "should have failed, oops")))
  )
\ No newline at end of file
diff --git a/test/test3.script b/test/test3.script
index 2a53d49ea3dddbed028fcce152d421560ae571b7..3020fdac4952a534e56663f6cfa33383cc3e6d8a 100644
--- a/test/test3.script
+++ b/test/test3.script
@@ -4,7 +4,7 @@
 (load "script-support")
 (load "../asdf")
 (in-package :asdf)
-(cl-user::exit-on-error 
+(cl-user::quit-on-error 
  (let ((fasl1 (compile-file-pathname (merge-pathnames "file1")))
        (fasl2 (compile-file-pathname (merge-pathnames "file2"))))
      (asdf:run-shell-command "rm -f ~A ~A"
diff --git a/test/test4.script b/test/test4.script
index be3186380e68034e0dba0ce046b12fce32e91886..0c549fb86558517dc5cc13c67ec39349cf9b0f08 100644
--- a/test/test4.script
+++ b/test/test4.script
@@ -3,7 +3,7 @@
 (load "script-support")
 (load "../asdf")
 (in-package :asdf)
-(cl-user::exit-on-error 
+(cl-user::quit-on-error 
  (setf asdf:*central-registry* '(*default-pathname-defaults*))
  (assert (not (component-property (find-system 'test3) :foo)))
  (assert (equal (component-property (find-system 'test3) :prop1) "value"))
diff --git a/test/test8.script b/test/test8.script
index 9950420d20e23a0724c75cae56d90a1fac9389db..bf07b217f4728ad97b9faec1a3fadc95b9953fea 100644
--- a/test/test8.script
+++ b/test/test8.script
@@ -6,14 +6,17 @@
 (load "../asdf")
 (in-package #:common-lisp-user)
 
-(exit-on-error 
+(quit-on-error 
  (setf asdf:*central-registry* '(*default-pathname-defaults*))
  (handler-case 
      (asdf:oos 'asdf:load-op 'system-does-not-exist)
    (asdf:missing-component-of-version (c)
+     (declare (ignore c))
      (error "Should not have gotten 'missing-component-of-version, dang"))
    (asdf:missing-component (c)
      (format t "got missing-component as expected: - ~%~A~%" c))
-   (:no-error (c) (error "should have failed, oops"))))
+   (:no-error (c)
+     (declare (ignore c))
+     (error "should have failed, oops"))))
 
 
diff --git a/test/test9.script b/test/test9.script
index bec42e7627a4d18525cb8c15fb7b05372298eb37..f819c49f84146590626cf2889a54ce16cf8e8b92 100644
--- a/test/test9.script
+++ b/test/test9.script
@@ -6,7 +6,7 @@
 (load "../asdf")
 (in-package #:common-lisp-user)
 
-(exit-on-error 
+(quit-on-error 
  (setf asdf:*central-registry* nil)
  (load (merge-pathnames "test9-1.asd"))
  (load (merge-pathnames "test9-2.asd"))
@@ -14,7 +14,9 @@
      (asdf:oos 'asdf:load-op 'test9-1)
    (asdf:missing-component-of-version (c)
      (format t "got missing-component-of-version as expected: - ~%~A~%" c))
-   (:no-error (c) (error "should have failed, oops"))))
+   (:no-error (c) 
+    (declare (ignore c))
+    (error "should have failed, oops"))))
 
 
 
diff --git a/test/wild-module.script b/test/wild-module.script
index 4a618007a8f7cb1dcc78cb288cb8324139a227aa..c45a95bfb5486c3cde37e5dcce6f67dd3c00d04f 100644
--- a/test/wild-module.script
+++ b/test/wild-module.script
@@ -1,7 +1,7 @@
 ;;; -*- Lisp -*-
 (load "script-support")
 (load "../asdf")
-(exit-on-error 
+(quit-on-error 
 
  (load "../asdf")
  (load "../wild-modules")
diff --git a/website/source/git.mmd b/website/source/git.mmd
new file mode 100644
index 0000000000000000000000000000000000000000..35483d2b2170e0a1fc4b742ce1720f719dc4b639
--- /dev/null
+++ b/website/source/git.mmd
@@ -0,0 +1,47 @@
+## git recipes
+
+
+ 
+ > Alternatively, would someone please provide simple recipes for dealing
+ > with git?  It's really far more complex than CVS, and I don't see
+ > obvious patterns of interaction to do simple things like restore
+ > synchronization with the central repo.
+
+ git fetch origin
+  downloads latest commits
+ git reset --hard origin/master 
+  nukes all local changes, synchronizing with the remote repo
+ 
+## git resources
+
+Here are a few links that might be helpful to people learning
+git. Its culturally different than CVS; but once you learn
+it, there's no turning back. The ability to experiment with
+local branches, back up, rewrite history, and only publish
+the sanitized history is quite liberating.
+
+* http://progit.org/book/ (recommended)
+* http://tomayko.com/writings/the-thing-about-git
+* http://git-scm.com/documentation
+* http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
+* http://www.kernel.org/pub/software/scm/git/docs/everyday.html
+* http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
+
+My suggestions
+
+*  always have `gitk --all` loaded for the repo you're working on
+
+* update (not reload) `gitk` after modifying any branches or
+  tags; this leaves the old objects displayed
+
+* `git reset --hard $OLDSHA1` can clean many messes, letting
+  you try again.
+
+* reload gitk to hide deleted branches you're comfortable
+  with losing
+
+* learn by playing around with local clones of a larger
+  repository
+
+* install some of the git contribs, especially
+  git-completion.bash and git-new-workdir