diff options
author | Daniel Barkalow <barkalow@iabervon.org> | 2008-02-07 11:40:16 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-09 23:16:51 -0800 |
commit | c369e7b805f927bb87fcf345dd19a55c8b9e6b8e (patch) | |
tree | ba3333f1efb75d21d3636adfb3d45ccf81b1c0d9 /branch.h | |
parent | 94a5728cfb593d80164620f8fa7e1ef322ad0025 (diff) | |
download | git-c369e7b805f927bb87fcf345dd19a55c8b9e6b8e.tar.gz |
Move code to clean up after a branch change to branch.c
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Diffstat (limited to 'branch.h')
-rw-r--r-- | branch.h | 20 |
1 files changed, 18 insertions, 2 deletions
@@ -1,8 +1,24 @@ #ifndef BRANCH_H #define BRANCH_H -void create_branch(const char *head, - const char *name, const char *start_name, +/* 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, int track); +/* + * Remove information about the state of working on the current + * branch. (E.g., MERGE_HEAD) + */ +void remove_branch_state(void); + #endif |