mirror of
https://github.com/git/git.git
synced 2024-11-26 03:14:50 +08:00
13931236b9
(Just like we did for documentation already) In the process, we change "non-remote branch" to "branch outside the refs/remotes/ hierarchy" to avoid the ugly "non-remote-tracking branch". The new formulation actually corresponds to how the code detects this case (i.e. prefixcmp(refname, "refs/remotes")). Also, we use 'remote-tracking branch' in generated merge messages (by merge an fmt-merge-msg). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
32 lines
1.1 KiB
C
32 lines
1.1 KiB
C
#ifndef BRANCH_H
|
|
#define BRANCH_H
|
|
|
|
/* 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);
|
|
|
|
/*
|
|
* Configure local branch "local" as downstream to branch "remote"
|
|
* from remote "origin". Used by git branch --set-upstream.
|
|
*/
|
|
#define BRANCH_CONFIG_VERBOSE 01
|
|
extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote);
|
|
|
|
#endif
|