15713 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	76fe19e66a	Merge pull request #1363 from github/diff-multiple-file-pairs-on-the-command-line ... Diff one or more pairs of files.	2017-09-27 16:35:07 -04:00
Rob Rix	d74c83fd9e	Diff one or more pairs of files.	2017-09-27 11:02:11 -04:00
Timothy Clem	34da19750b	Merge pull request #1323 from github/ruby-assignment-ftw ... WIP: Ruby assignment FTW!	2017-09-25 10:37:52 -07:00
Timothy Clem	0642755c35	Merge remote-tracking branch 'origin/master' into ruby-assignment-ftw	2017-09-25 09:08:14 -07:00
Timothy Clem	f40b6fd1c8	Merge pull request #1348 from github/toc-assignment ... New --toc-assignment flag	2017-09-25 08:55:59 -07:00
Timothy Clem	289b342ba0	Merge branch 'master' into toc-assignment	2017-09-25 08:47:30 -07:00
Rob Rix	7e167a75b4	Merge pull request #1341 from github/alternative-algorithms ... Alternative Algorithms	2017-09-25 11:46:47 -04:00
Rob Rix	5d812f3a03	Merge branch 'master' into alternative-algorithms	2017-09-25 11:44:17 -04:00
Timothy Clem	4b311dba8e	Merge pull request #1349 from github/log-tags ... Tag log entries so we can sort, filter, and stat	2017-09-25 08:43:13 -07:00
Rob Rix	8babcb9579	🔥 Symmetrical.	2017-09-25 11:35:10 -04:00
Rob Rix	76037c08b2	Merge branch 'master' into alternative-algorithms	2017-09-25 11:29:44 -04:00
Timothy Clem	ddebcc044d	Make it really clear where we are headed	2017-09-25 08:24:48 -07:00
Timothy Clem	0290e63095	Whoops, these need to be tuples	2017-09-25 08:06:11 -07:00
Timothy Clem	18421aa07f	Merge branch 'master' into ruby-assignment-ftw	2017-09-22 10:29:13 -07:00
Timothy Clem	bdb71f23d0	Merge branch 'master' into log-tags	2017-09-22 10:28:57 -07:00
Timothy Clem	0c6d04ff60	Merge branch 'master' into toc-assignment	2017-09-22 10:28:48 -07:00
Timothy Clem	dd4726dbb0	Merge pull request #1350 from github/add-dependent-file-to-json ... Add addDependentFileRelative call to json grammar	2017-09-22 10:28:33 -07:00
Timothy Clem	6a0636ac5f	Tag log entries so we can sort, filter, and stat	2017-09-22 10:09:29 -07:00
joshvera	85ee878bdc	Remove snapshot.yaml	2017-09-22 13:02:16 -04:00
joshvera	1c7962b4a1	addDependentFileRelative for json	2017-09-22 12:59:17 -04:00
Timothy Clem	56e340a3ff	Test the new assignment toc renderer	2017-09-22 09:47:06 -07:00
Timothy Clem	b83914a860	Merge branch 'toc-assignment' into ruby-assignment-ftw	2017-09-22 09:45:04 -07:00
Timothy Clem	8df2b75eff	Merge branch 'master' into ruby-assignment-ftw	2017-09-22 09:39:39 -07:00
Timothy Clem	7172d8ac0d	New --toc-assignment flag	2017-09-22 09:31:51 -07:00
Josh Vera	a351b53678	Merge pull request #1346 from github/custom-snapshot ... Custom snapshot	2017-09-20 11:04:15 -04:00
Rob Rix	ec9ca1dbe8	Move the hackage extra-deps into the snapshot.	2017-09-19 14:56:48 -04:00
Rob Rix	818a657015	Stub in a snapshot based on the same nightly as stack.yaml.	2017-09-19 14:53:39 -04:00
Rob Rix	79d2ebff30	Merge branch 'master' into alternative-algorithms	2017-09-19 14:39:35 -04:00
Timothy Clem	13b85ac828	Merge remote-tracking branch 'origin/master' into ruby-assignment-ftw	2017-09-19 11:31:46 -07:00
Timothy Clem	5d680f5205	Merge pull request #1345 from github/optimized-dedupe ... Rewrite dedupe with a Map and single pass on the list	2017-09-19 11:30:01 -07:00
Timothy Clem	18d04df588	Sync with master for vendor/effects	2017-09-19 11:22:59 -07:00
Timothy Clem	ee7032edc2	Merge remote-tracking branch 'origin/master' into ruby-assignment-ftw	2017-09-19 11:19:43 -07:00
Rob Rix	7adc1863b6	Merge branch 'master' into alternative-algorithms	2017-09-19 14:16:12 -04:00
Timothy Clem	629ac7c67e	Merge branch 'master' into optimized-dedupe	2017-09-19 11:10:39 -07:00
Timothy Clem	5a9f37064b	Merge pull request #1343 from github/equal-terms ... Equivalent Terms	2017-09-19 11:10:17 -07:00
Rob Rix	f93befa5be	Merge branch 'master' into alternative-algorithms	2017-09-19 13:56:36 -04:00
Rob Rix	f0beb9d2ae	Merge branch 'master' into optimized-dedupe	2017-09-19 13:54:49 -04:00
Timothy Clem	a0a6b87079	Rewrite dedupe with a Map and single pass on the list	2017-09-19 10:50:03 -07:00
Timothy Clem	0693d9ead2	Merge branch 'master' into equal-terms	2017-09-19 10:49:04 -07:00
Timothy Clem	cbc638a230	Merge pull request #1344 from github/assignment-toc-rendering-improvements ... Fixes to assignment powered toc summaries	2017-09-19 10:48:46 -07:00
Timothy Clem	b8ebd83cee	Improved docs	2017-09-19 10:29:25 -07:00
Timothy Clem	2a0133f1f4	Match previous rendering of assignment powered toc summaries	2017-09-19 10:12:52 -07:00
Timothy Clem	8d37a879cd	Merge branch 'master' into equal-terms	2017-09-19 10:11:48 -07:00
Rob Rix	91972e5db3	Merge branch 'master' into alternative-algorithms	2017-09-19 12:55:04 -04:00
Rob Rix	1fe8d88d07	Merge pull request #1342 from github/relocate-slurp ... Relocate slurp	2017-09-19 12:54:01 -04:00
Timothy Clem	44d59f4e4d	Some updated python fixtures due to eqTerms	2017-09-19 09:37:50 -07:00
Timothy Clem	7107aec6db	Add a equivalency check for terms	2017-09-19 09:36:12 -07:00
Rob Rix	573ae6bf39	Move slurp into a separate package.	2017-09-19 12:13:00 -04:00
Timothy Clem	2d17064681	No need for this instance	2017-09-19 08:53:01 -07:00
Rob Rix	59ca7a5e51	Merge branch 'master' into substructural-diffing	2017-09-19 11:07:25 -04:00