Merge branch 'show-command' into pu

* branch show-command:
  t3001: use '--show' to get the instruction sheet
  Add '--show' to print the instruction sheet

I'm not sure about this.  Should it be --cat instead of --show?  Is it
too similar to --status below?
Merge branch 'skip-option' into pu

* branch skip-option:
  WIP
  Add --skip option

Needs more work to be able to handle "branch not found".

Conflicts:
	git-integration.sh
Merge branch 'manpage-on-site' into pu

* branch manpage-on-site:
  WIP

WIP to improve the web site
Merge branch 'merge-options' into pu

* branch merge-options:
  Allow user-specified merge options
Merge branch 'doc-fixes' into pu

* branch doc-fixes:
  git-integration(1): quote options consistently