3 commits

Author	SHA1	Message	Date
Joey Hess	0962d50ad2	typo	2012-07-17 14:51:42 -04:00
Joey Hess	4db09814e4	avoid --no-edit with older git versions	2012-07-17 14:50:37 -04:00
Joey Hess	c79e3b67e9	sync: Avoid recent git's interactive merge.	2012-06-23 10:22:56 -04:00