## only merges on master

*   07873dc - (HEAD, origin/master, origin/HEAD, master) Merge branch 'maint' (4 weeks ago) <Ju$
|\
| * 964498e - (origin/maint) Documentation: fix a typo in git-apply.txt (4 weeks ago) <Michał K$
| * b31d202 - init: remove unnecessary check (4 weeks ago) <Nguyễn Thái Ngọc Duy>
* |   6d74e5c - Merge branch 'mh/p4' (4 weeks ago) <Junio C Hamano>
|\ \
| * | c9dbab0 - git-p4 submit: prevent 'Jobs' section from being removed from p4 change log (5 $
* | |   08fd871 - Merge branch 'mg/maint-difftool-vim-readonly' (4 weeks ago) <Junio C Hamano>
|\ \ \
| * | | 853c0ff - mergetool-lib: call vim in readonly mode for diffs (5 weeks ago) <Michael J G$
* | | |   5cb3c9b - Merge branch 'jn/maint-commit-missing-template' (4 weeks ago) <Junio C Hama$
|\ \ \ \
| * | | | 2140b14 - commit: error out for missing commit message template (5 weeks ago) <Jonath$
* | | | |   1538f21 - Merge branch 'jk/diffstat-binary' (4 weeks ago) <Junio C Hamano>
|\ \ \ \ \
| * | | | | abb371a - diff: don't retrieve binary blobs for diffstat (6 weeks ago) <Jeff King>
| * | | | | ded0abc - diff: handle diffstat of rewritten binary files (6 weeks ago) <Jeff King>
* | | | | |   24161eb - Merge branch 'lt/rename-no-extra-copy-detection' (4 weeks ago) <Junio C$
|\ \ \ \ \ \
| * | | | | | 3a4d676 - diffcore-rename: improve estimate_similarity() heuristics (6 weeks ago)$
| * | | | | | 0940e5f - diffcore-rename: properly honor the difference between -M and -C (6 wee$
| * | | | | | 11f944d - for_each_hash: allow passing a 'void *data' pointer to callback (6 week$
| | |_|/ / /
| |/| | | |
* | | | | |   53d31d7 - Merge branch 'jn/test-terminal-punt-on-osx-breakage' (4 weeks ago) <Jun$


## supercommits
* 0bbfa9f - (HEAD, origin/maven, origin/HEAD, maven) Tests would assume that temp directory had bee$
* a616b6d - Hahahahaha.  UseManyTables.  HAHAHAHAH (7 days ago) <Chris West (Faux)>
* 0ae9767 - What an Alias test would look like, but failing (7 days ago) <Chris West (Faux)>
*   8e7c9db - Make it look more like a test framework (7 days ago) <Chris West (Faux)>
|\
| * 07b905b - Set temporary databases to delete on exit (7 days ago) <Chris West (Faux)>
| * 3d4ef8f - Golf TalkTest (7 days ago) <Chris West (Faux)>
| * 7f2918c - Cleanup the insides of TalkTest (7 days ago) <Chris West (Faux)>
* |   4a3c979 - First attempt at a horrifically procedural test, including hacking bits of core int$
|\ \
| |/
| * 12cb1ae - Holy crap it passes (8 days ago) <Chris West (Faux)>
| * d147de2 - Test: Get to a database error (8 days ago) <Chris West (Faux)>
| * 7faa766 - Untested, Remove loads of static state in Choob's contructor's dependencies (8 days a$
| * 81f992d - squash! ChoobPluginManagerState non-static (8 days ago) <Chris West (Faux)>
| * d5b7e5c - static ChoobPluginManagerState (8 days ago) <Chris West (Faux)>
| * 29aaadb - Extract interface Choob.java (8 days ago) <Chris West (Faux)>
|/
* 7fa689e - Ignore IDEA project files (8 days ago) <Chris West (Faux)>


## superrebase

* 1b2d536 - Fix Eclipse resolution of plugins; this may be different in other IDEs (9 days ago) <Ch$
* 35c979d - Fix ChoobSetup's writing of channels; Autojoin is now needed (9 days ago) <Chris West ($
* db7b857 - ChoobSetup fixup (9 days ago) <Chris West (Faux)>
* 893bc0d - Ability to set bot.conf values from properties (9 days ago) <Chris West (Faux)>
* 419f09d - Ability to load plugins from choob-plugin:/Plugin.java (9 days ago) <Chris West (Faux)>
* 5390099 - Version bumps (9 days ago) <Chris West (Faux)>
* c4bd545 - Maven <scm (9 days ago) <Chris West (Faux)>