From 0b7d8d44d91f748383bd969094fa31ba399eaf11 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 9 Feb 2016 16:32:40 -0400 Subject: [PATCH] update --- doc/design/adjusted_branches.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 5c70e4ea91..6cb282f1b6 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