Merge branch 'reset-submodule-trailing-slash' into jk/pu

* branch reset-submodule-trailing-slash:
  WIP built on nd/magic-pathspecs
Merge branch 'rebase-i-comment-squash' into jk/pu

* branch rebase-i-comment-squash:
  rebase -i: comment first line of autosquashed message
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