5d92ed6ea7
need to -s theirs or the merge is likely to fail
2014-08-19 17:57:32 -04:00
c0cc5d214b
Merge branch 'joeyconfig'
2014-08-19 17:55:37 -04:00
d289a222d5
simpler merge
...
Ah, we've checked out the oldref, so can just merge the newref in and get a
branch that is suitable for mergeing into the user's repo. No need for
manual diff, which can fail on eg, binaries or no changes.
2014-08-19 17:54:49 -04:00
4634f3cf47
Merge branch 'joeyconfig'
2014-08-19 17:51:43 -04:00
adf8b2ec34
need to connect up history
2014-08-19 17:51:34 -04:00
845877a44a
Merge branch 'joeyconfig'
2014-08-19 17:34:29 -04:00
6f8f0c1c6b
beargN
2014-08-19 17:34:25 -04:00
7e069973f8
Merge branch 'joeyconfig'
2014-08-19 17:33:07 -04:00
7a34a1efbf
merge from master
2014-08-19 17:33:00 -04:00
25312ae18b
Merge branch 'joeyconfig'
2014-08-19 17:31:15 -04:00
215a8e7f0e
merge from master
2014-08-19 17:31:09 -04:00
5160041df9
Merge branch 'joeyconfig'
...
Conflicts:
Makefile
2014-08-19 17:30:34 -04:00
4766442124
bleargh45678etc
2014-08-19 17:30:10 -04:00
eff0fe5dff
bleargh3
2014-08-19 17:25:05 -04:00
afe75ef651
Merge branch 'joeyconfig'
2014-08-19 17:24:20 -04:00
5365334ac2
double bleargh
2014-08-19 17:24:13 -04:00
33f2e899d2
Merge branch 'joeyconfig'
2014-08-19 17:22:18 -04:00
d366e5e525
bleargh
2014-08-19 17:22:14 -04:00
e29c7080e8
Merge branch 'joeyconfig'
2014-08-19 17:19:48 -04:00
7c558cfad1
oh, can't use cabal sdist --list-sources
...
Doesn't work when using ./Setup as cabal
2014-08-19 17:19:28 -04:00
bddd8c7b91
Merge branch 'joeyconfig'
2014-08-19 17:17:42 -04:00
1bf736293d
syntax
2014-08-19 17:17:36 -04:00
bd1af7f39f
Merge branch 'joeyconfig'
2014-08-19 17:17:05 -04:00
7743da0c3d
syntax
2014-08-19 17:17:01 -04:00
9516c4e76b
Merge branch 'joeyconfig'
2014-08-19 17:16:17 -04:00
fc967dfa4c
oops, can't rely on a git repo when building debian package..
2014-08-19 17:15:58 -04:00
d54ee6c336
color message
2014-08-19 17:12:57 -04:00
16c33945e2
Merge branch 'joeyconfig'
2014-08-19 17:09:54 -04:00
f72a1aa690
fixes
2014-08-19 17:09:11 -04:00
b938dbbe3c
Merge branch 'joeyconfig'
2014-08-19 17:00:56 -04:00
371f6077fd
prep release
2014-08-19 17:00:49 -04:00
429f793fc3
Merge branch 'joeyconfig'
2014-08-19 16:58:38 -04:00
7c0e2125a2
fix
2014-08-19 16:58:35 -04:00
d66216b92a
Merge branch 'joeyconfig'
2014-08-19 16:57:32 -04:00
32ca119859
fix
2014-08-19 16:57:26 -04:00
5b651cf818
Merge branch 'joeyconfig'
2014-08-19 16:56:24 -04:00
b9f1e87604
use git archive, rather than cabal sdist for making single-commit git repo
...
This makes the symlinks be preserved, which it seems cabal does not do.
2014-08-19 16:55:44 -04:00
922f916baf
Merge branch 'joeyconfig'
2014-08-19 16:47:06 -04:00
1ada0f1014
fix ref name
2014-08-19 16:47:00 -04:00
2ed83d6fcc
Merge branch 'joeyconfig'
2014-08-19 16:45:00 -04:00
4ae9578e36
head file will end with a newline
2014-08-19 16:44:51 -04:00
16c01b24ce
Merge branch 'joeyconfig'
2014-08-19 16:40:31 -04:00
3c61c109fb
ugly workaround for lack of history in repo distributed with debian package
2014-08-19 16:40:04 -04:00
c57ff0cb46
Merge branch 'joeyconfig'
2014-08-19 15:29:43 -04:00
e0bbb776bf
final fixes
2014-08-19 15:29:32 -04:00
c157fd4026
Merge branch 'joeyconfig'
2014-08-19 15:24:22 -04:00
882872b1ec
typo
2014-08-19 15:24:18 -04:00
4cb37fc564
Merge branch 'joeyconfig'
2014-08-19 15:23:33 -04:00
8e45b0f77b
warnings
2014-08-19 15:23:29 -04:00
77f79fa032
Merge branch 'joeyconfig'
2014-08-19 15:22:48 -04:00
Joey Hess