git/contrib, branch v2.2.1

Merge branch 'js/diff-highlight-avoid-sigpipe'

2014-11-10T19:26:09Z

* js/diff-highlight-avoid-sigpipe: diff-highlight: exit when a pipe is broken

diff-highlight: exit when a pipe is broken

2014-11-04T21:18:35Z

While using diff-highlight with other tools, I have discovered that Python ignores SIGPIPE by default. Unfortunately, this also means that tools attempting to launch a pager under Python--and don't realize this is happening--means that the subprocess inherits this setting. In this case, it means diff-highlight will be launched with SIGPIPE being ignored. Let's work with those broken scripts by restoring the default SIGPIPE handler. Signed-off-by: John Szakmeister Acked-by: Jeff King Signed-off-by: Junio C Hamano

Documentation: typofixes

2014-11-04T21:14:44Z

In addition to fixing trivial and obvious typos, be careful about the following points: - Spell ASCII, URL and CRC in ALL CAPS; - Spell Linux as Capitalized; - Do not omit periods in "i.e." and "e.g.". Signed-off-by: Thomas Ackermann Signed-off-by: Junio C Hamano

Merge branch 'oc/mergetools-beyondcompare'

2014-10-29T17:08:04Z

* oc/mergetools-beyondcompare: mergetool: rename bc3 to bc

Merge branch 'js/completion-hide-not-a-repo'

2014-10-21T20:28:50Z

Some internal error messages leaked out of the bash completion when typing "git cmd " and the machinery tried to complete refnames. * js/completion-hide-not-a-repo: completion: silence "fatal: Not a git repository" error

mergetool: rename bc3 to bc

2014-10-21T18:25:30Z

Beyond Compare version 4 works the same way as version 3, so rename the existing "bc3" adaptor to just "bc", while keeping "bc3" as a backward compatible wrapper. Noticed-by: Olivier Croquette Helped-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'ss/contrib-subtree-contacts'

2014-10-20T19:25:16Z

* ss/contrib-subtree-contacts: contacts: add a Makefile to generate docs and install subtree: add an install-html target

Merge branch 'jc/completion-no-chdir'

2014-10-16T21:16:49Z

* jc/completion-no-chdir: completion: use "git -C $there" instead of (cd $there && git ...)

contacts: add a Makefile to generate docs and install

2014-10-15T22:18:27Z

Also add a gitignore file for generated files. Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

subtree: add an install-html target

2014-10-15T22:17:08Z

Also adjust ignore rules accordingly. Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano