Add merge alias and options for push/pull.

Partial #5.