summaryrefslogtreecommitdiff
path: root/branch.h
diff options
context:
space:
mode:
Diffstat (limited to 'branch.h')
-rw-r--r--branch.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/branch.h b/branch.h
index 29c1afa..c90ba9d 100644
--- a/branch.h
+++ b/branch.h
@@ -61,6 +61,12 @@ extern int validate_branchname(const char *name, struct strbuf *ref);
extern 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)
*/