Added the --expand [ or --pushback or --merge ] options.
Added the --expand [ or --pushback or --merge ] options.

--expand is a bit confusing to remember for some reason.  and merge
could conflict with git thinking... pushback makes the most sense.

zaiah/cache