Commit Graph

4 Commits

Author SHA1 Message Date
Steve Streeting
2c9cdc77d7 Merge branch 'master' into locking-master-2, with fixes
# Conflicts:
#	locking/locks.go
2017-01-16 12:06:21 +00:00
Steve Streeting
43acc16196 Support disabling read-only behaviour via gitconfig as well 2017-01-06 09:53:14 +00:00
Steve Streeting
581e109ff6 Move readonly config check to before lock client instantiation 2017-01-06 09:37:31 +00:00
Steve Streeting
e1068a2921 Add post-merge hook to make files read-only again if not locked 2017-01-02 16:56:47 +00:00