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?  It is
too similar to --status below?
Merge branch 'status-command' into pu

* branch status-command:
  Add --status command
  Die if run_integration fails
  Extract parsing from command processing
  Move 'dedent' function nearer the top of the file

Still needs some tests, but seems to be working nicely.  It would be
nice to have some flags for different verbosity of output, but that
isn't needed for the first version of this.

Conflicts:
	Documentation/git-integration.txt
	git-integration.sh
Merge branch 'doc-fixes' into pu

* branch doc-fixes:
  Add parens around '--continue | --abort' in usage
  Simplify usage examples
  git-integration(1): fix formatting of config variables list

Conflicts:
	Documentation/git-integration.txt