update:  a bit more clarity with regard to the rebase/merge duality
update:  make the head update respect the rebase/merge duality