Merge branch 'tb/ref-filter-multiple-patterns'

diff --git a/branch.h b/branch.h
index 6f38db14e9c496c55e204791e5ab0a5243186118..df0be61506fd36a0bfb63a911ba532b5db495767 100644 (file)
--- a/branch.h
+++ b/branch.h
@@ -60,11 +60,17 @@ int validate_branchname(const char *name, struct strbuf *ref);
  */
 int validate_new_branchname(const char *name, struct strbuf *ref, int force);
 
+/*
+ * Remove information about the merge state on the current
+ * branch. (E.g., MERGE_HEAD)
+ */
+void remove_merge_branch_state(struct repository *r);
+
 /*
  * Remove information about the state of working on the current
  * branch. (E.g., MERGE_HEAD)
  */
-void remove_branch_state(struct repository *r);
+void remove_branch_state(struct repository *r, int verbose);
 
 /*
  * Configure local branch "local" as downstream to branch "remote"