Merge branch 'jc/conflict-marker-size' into maint
[tgit.git] / branch.h
blobeed817a64c7620bfe67f395e39b4eef2f85a4ab3
1 #ifndef BRANCH_H
2 #define BRANCH_H
4 /* Functions for acting on the information about branches. */
6 /*
7 * Creates a new branch, where head is the branch currently checked
8 * out, name is the new branch name, start_name is the name of the
9 * existing branch that the new branch should start from, force
10 * enables overwriting an existing (non-head) branch, reflog creates a
11 * reflog for the branch, and track causes the new branch to be
12 * configured to merge the remote branch that start_name is a tracking
13 * branch for (if any).
15 void create_branch(const char *head, const char *name, const char *start_name,
16 int force, int reflog, enum branch_track track);
19 * Remove information about the state of working on the current
20 * branch. (E.g., MERGE_HEAD)
22 void remove_branch_state(void);
25 * Configure local branch "local" to merge remote branch "remote"
26 * taken from origin "origin".
28 #define BRANCH_CONFIG_VERBOSE 01
29 extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote);
31 #endif