Merge branch 'abort-dont-touch-other-branches' into pu

* branch abort-dont-touch-other-branches:
  --abort shouldn't modify any refs
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 '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

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 '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