Merge branch 'master' into desymlink

This commit is contained in:
Joey Hess 2012-12-13 00:46:10 -04:00
commit ffdd08fd2e
33 changed files with 97 additions and 100 deletions

View file

@ -27,7 +27,7 @@ setConfig (ConfigKey key) value = do
{- Unsets a git config setting. (Leaves it in state currently.) -}
unsetConfig :: ConfigKey -> Annex ()
unsetConfig (ConfigKey key) = inRepo $ Git.Command.run "config"
[Param "--unset", Param key]
[Param "--unset", Param key]
{- Looks up a setting in git config. -}
getConfig :: ConfigKey -> String -> Annex String