Merge branch 'unstuck-diff-algorithm' into jk/pu

* branch unstuck-diff-algorithm:
  diff: allow unstuck arguments with --diff-algorithm

Sent upstream.
Merge branch 'merge-doc-diff-algorithm' into jk/pu

* branch merge-doc-diff-algorithm:
  git-merge(1): document diff-algorithm option to merge-recursive

Sent upstream.
Merge branch 'submodule-diff-graph' into jk/pu

* branch submodule-diff-graph:
  submodule: print graph output next to submodule log

Sent upstream.
Merge branch 'doc-remote-helpers-refspec' into jk/pu

* branch doc-remote-helpers-refspec:
  gitremote-helpers(1): clarify refspec behaviour

Sent upstream.
Merge branch 'completion-fixes' into jk/pu

* branch completion-fixes:
  completion: learn more git base options
  completion: handle unstuck form of base git options
Merge branch 'doc-makefile-fix' into jk/pu

* branch doc-makefile-fix:
  Documentation/Makefile: move infodir to be with other '*dir's
  Documentation/Makefile: fix spaces around assignments
Merge branch 'merge-tree-same-added-in-sub' into jk/pu

* branch merge-tree-same-added-in-sub:
  merge-tree: fix "same file added in subdir" inconsistency

Currently in pu but should be re-rolled if someone responds to this
message:

  http://article.gmane.org/gmane.comp.version-control.git/219378

Conflicts:
	builtin/merge-tree.c
Merge branch 'rebase-i-comment-squash' into jk/pu

* branch rebase-i-comment-squash:
  rebase -i: comment first line of autosquashed message

Comment out the first line of a "!squash" commit when generating a
commit message in git-rebase.

Merged to jk/pu on 2013-03-30.  Dogfooding for a while to see if
this is a sensible change.
Merge branch 'reset-submodule-trailing-slash' into jk/pu

* branch reset-submodule-trailing-slash:
  WIP built on nd/magic-pathspecs

Waiting for nd/magic-pathspecs to graduate to master.