16 Commits

Author	SHA1	Message	Date
Anthony Sottile	5810ee4315	Implement merge-files only using @bukzor's method.	2014-04-15 09:17:55 -07:00
Anthony Sottile	2e4cde9cb0	Simplify has_unmerged_paths	2014-04-13 23:52:52 -07:00
Anthony Sottile	846ddeed67	Fixes crash during merge conflict. Closes #82.	2014-04-13 23:44:53 -07:00
Anthony Sottile	3e2b1862ad	Don't stash with --all-files. Closes #68.	2014-04-13 20:04:58 -07:00
Anthony Sottile	8a8b2241a6	Add --no-stash option.	2014-04-13 20:00:10 -07:00
Anthony Sottile	5386b0eea0	Pass write down from commands to logging handler.	2014-04-13 18:43:43 -07:00
Anthony Sottile	de24712a6f	Skip hooks if no files to check. Closes #69.	2014-04-13 17:39:58 -07:00
Anthony Sottile	5eda121260	Move stuff into commands and write tests.	2014-04-13 14:07:52 -07:00
Anthony Sottile	e58d28aad3	yaml extensions and ordereddict are now imported from asottile.	2014-04-12 16:12:10 -07:00
Anthony Sottile	1746a97e24	Better project structure	2014-04-12 15:56:18 -07:00
Anthony Sottile	8b5c3b8745	Fix autoupdate spamming with defaults.	2014-04-03 22:11:53 -07:00
Anthony Sottile	fa953d4c2d	Implement the clean command.	2014-03-30 18:34:57 -07:00
Anthony Sottile	26d563ee20	Autoupdate works. Closes #44.	2014-03-23 22:57:19 -07:00
Anthony Sottile	49da1ba72a	Added the useful thinking bit of the autoupdate and tests.	2014-03-23 21:35:35 -07:00
Anthony Sottile	c695ee9a9a	Move printing inside the commands for install and uninstall	2014-03-23 20:21:59 -07:00
Anthony Sottile	ecdacd474b	Simplify the install and uninstall commands and improve tests.	2014-03-23 18:33:18 -07:00