Joey Hess 584eac78e6 sync: Fix an edge case where syncing in a bare repository would try to merge and so fail. ... In the case where a remote of the bare repo has a fetch = configuration, refs/remotes/origin/master will exist, and so the merge code path tried to run in the bare repo.		2015-01-05 13:40:49 -04:00
..
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
cabal-wrapper	Add temporary workaround for bug #763078 which broke building on armel and armhf.	2014-09-27 14:22:04 -04:00
changelog	sync: Fix an edge case where syncing in a bare repository would try to merge and so fail.	2015-01-05 13:40:49 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	touchups	2014-12-31 15:27:20 -04:00
copyright	add copyright of code copied from yesod	2014-10-09 15:17:07 -04:00
doc-base	Add doc-base file. Closes: #621408	2011-04-06 21:57:22 -04:00
menu	fixups	2013-05-15 22:48:27 -04:00
NEWS	prep release	2013-10-02 16:13:45 -04:00
rules	remove PatchedAWS flag	2014-12-03 15:09:18 -04:00