Merge branch 'en/merge-recursive-2'
[git/gitweb.git] / branch.h
blob01544e25cbbf77c573da38c73f105a8b62c55f99
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 * Validates that the requested branch may be created, returning the
20 * interpreted ref in ref, force indicates whether (non-head) branches
21 * may be overwritten. A non-zero return value indicates that the force
22 * parameter was non-zero and the branch already exists.
24 int validate_new_branchname(const char *name, struct strbuf *ref, int force);
27 * Remove information about the state of working on the current
28 * branch. (E.g., MERGE_HEAD)
30 void remove_branch_state(void);
33 * Configure local branch "local" as downstream to branch "remote"
34 * from remote "origin". Used by git branch --set-upstream.
36 #define BRANCH_CONFIG_VERBOSE 01
37 extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote);
39 #endif