Staging
v0.5.1
https://github.com/git/git
Revision 9bd81e4249a419f9cde8fd68e033e263533f4914 authored by Junio C Hamano on 25 May 2008, 21:25:02 UTC, committed by Junio C Hamano on 25 May 2008, 21:25:02 UTC
* js/config-cb:
  Provide git_config with a callback-data parameter

Conflicts:

	builtin-add.c
	builtin-cat-file.c
2 parent s 450c5ae + ef90d6d
Raw File
Tip revision: 9bd81e4249a419f9cde8fd68e033e263533f4914 authored by Junio C Hamano on 25 May 2008, 21:25:02 UTC
Merge branch 'js/config-cb'
Tip revision: 9bd81e4
branch.h
#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);

#endif
back to top