diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-02-09 16:32:40 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-02-09 16:32:40 -0400 |
commit | 253520fc8598f8c13cb5461db26076a82a152780 (patch) | |
tree | 2d649caa87a7c25fb0bb8859cd35a39771510f58 /doc | |
parent | cbd732008b387f205df8c84590fdcdcb5a39ed3a (diff) |
update
Diffstat (limited to 'doc')
-rw-r--r-- | doc/design/adjusted_branches.mdwn | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 5c70e4ea9..6cb282f1b 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -215,8 +215,10 @@ like this, at its most simple: | otherwise = filterAction UnlockFilter f fi filterAction _ f _ = UnchangedFile f - applyFilterAction :: FilePath -> FilterAction -> Annex Bool + filteredCommit :: Filter -> Git.Commit -> Git.Commit -- Generate a version of the commit made on the filter branch -- with the filtering of modified files reversed. unfilteredCommit :: Filter -> Git.Commit -> Git.Commit + + isFilteredCommit :: Git.Commit -> Bool |