diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-13 00:46:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:46:10 -0400 |
| commit | 49a456e8be7fcfdf22554bd2c019da7f9d77ec5f (patch) | |
| tree | 07d3e3ef1d83c374cdfaf6bbd76d7aeb05c5c29c /Git | |
| parent | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (diff) | |
| parent | 7db480af0f944ca0e6c062cd1243c63ad7f878d1 (diff) | |
Merge branch 'master' into desymlink
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Construct.hs | 2 | ||||
| -rw-r--r-- | Git/Sha.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Git/Construct.hs b/Git/Construct.hs index 4f6a63d86..bafb16874 100644 --- a/Git/Construct.hs +++ b/Git/Construct.hs @@ -125,7 +125,7 @@ remoteNamed n constructor = do return $ r { remoteName = Just n } {- Sets the name of a remote based on the git config key, such as - "remote.foo.url". -} + - "remote.foo.url". -} remoteNamedFromKey :: String -> IO Repo -> IO Repo remoteNamedFromKey k = remoteNamed basename where diff --git a/Git/Sha.hs b/Git/Sha.hs index e62b29dab..ee1b6d669 100644 --- a/Git/Sha.hs +++ b/Git/Sha.hs @@ -11,7 +11,7 @@ import Common import Git.Types {- Runs an action that causes a git subcommand to emit a Sha, and strips - any trailing newline, returning the sha. -} + - any trailing newline, returning the sha. -} getSha :: String -> IO String -> IO Sha getSha subcommand a = maybe bad return =<< extractSha <$> a where |