Merge branch 'git-gui-fix-subdir' into jk/pu

* branch git-gui-fix-subdir:
  git-gui: fix file name handling with non-empty prefix
  git-gui: fix the mergetool launcher for the Beyond Compare tool.
  Makefile: replace "echo 1>..." with "echo >..."
  French translation: copy -> copie.
  git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>

Submitted upstream but mail to the maintainer bounced.
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 '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 'python-2to3-in-makefile' into jk/pu

* branch python-2to3-in-makefile:
  fixup! svn-fe: allow svnrdump_sim.py to run with Python 3
  Makefile: Run 2to3 on Python scripts
Merge branch 'revision-cherry-respect-ancestry-path' into jk/pu

* branch revision-cherry-respect-ancestry-path:
  revision.c: apply ancestry path before cherry
  revision.c: don't inspect uninteresting commits for cherry

Make revision.c's cherry options respect commit limiting.

Conflicts:
	revision.c
Merge branch 'merge-base-merge-child' into jk/pu

* branch merge-base-merge-child:
  merge-base: add --merge-child option
  commit: add commit_list_contains function

Experimental new option to merge-base.  Unnecessary with the changes in
revision-cherry-respect-ancestry-path.
Merge branch 'patch-id-notes-cache' into jk/pu

* branch patch-id-notes-cache:
  patch-ids: cache patch IDs in a notes tree

Experiment to cache patch IDs in a notes tree.
Merge branch 'patch-id-limit-paths' into jk/pu

* branch patch-id-limit-paths:
  WIP
  patch-ids: check modified paths before calculating diff
  tree-walk.h: extract alloc_traverse_path from builtin/merge-tree.c

Conflicts:
	patch-ids.c
	patch-ids.h
Merge branch 'format-patch-msgstore' into jk/pu

* branch format-patch-msgstore:
  WIP
  Extract RFC2822 from builtin/mailinfo.c
  rfc2822: extract header handling from mailinfo
Merge branch 'add-interactive-diff-algo' into jk/pu

* branch add-interactive-diff-algo:
  WIP - NEEDS TESTS - how?