X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.h;h=9f0c2a2c1fab9a312f436880956da0973c68ead8;hb=d1b28f512c6d2c7d373c746d8876dbf177ddf114;hp=8bcd9dc217cccbd0a4bf44ba076fa181a932c289;hpb=e496c00348140e73bdd202443df52192f6928541;p=git.git

diff --git a/branch.h b/branch.h
index 8bcd9dc21..9f0c2a2c1 100644
--- a/branch.h
+++ b/branch.h
@@ -1,8 +1,24 @@
 #ifndef BRANCH_H
 #define BRANCH_H
 
-void create_branch(const char *head,
-		   const char *name, const char *start_name,
-		   int force, int reflog, int track);
+/* Functions for acting on the information about branches. */
+
+/*
+ * Creates a new branch, where head is the branch currently checked
+ * out, name is the new branch name, start_name is the name of the
+ * existing branch that the new branch should start from, force
+ * enables overwriting an existing (non-head) branch, reflog creates a
+ * reflog for the branch, and track causes the new branch to be
+ * configured to merge the remote branch that start_name is a tracking
+ * branch for (if any).
+ */
+void create_branch(const char *head, const char *name, const char *start_name,
+		   int force, int reflog, enum branch_track track);
+
+/*
+ * Remove information about the state of working on the current
+ * branch. (E.g., MERGE_HEAD)
+ */
+void remove_branch_state(void);
 
 #endif