diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-12 17:55:18 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-12 17:56:25 -0700 |
commit | 7d5a1806e8c2d9980938a05a56939272ad2ec338 (patch) | |
tree | 6a09da6a7a0d76a3bf1fc0f2d860349c6efe1de9 /branch.h | |
parent | 078688213f321ac52c224c1cfa264d686c7264bd (diff) | |
parent | c965c029330b1f81cc107c5d829e7fd79c61d8ea (diff) | |
download | git-7d5a1806e8c2d9980938a05a56939272ad2ec338.tar.gz |
Mark t1301 permission test to depend on POSIXPERM
This prepares the topic for inclusion to master.
Diffstat (limited to 'branch.h')
-rw-r--r-- | branch.h | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -21,4 +21,11 @@ void create_branch(const char *head, const char *name, const char *start_name, */ void remove_branch_state(void); +/* + * Configure local branch "local" to merge remote branch "remote" + * taken from origin "origin". + */ +#define BRANCH_CONFIG_VERBOSE 01 +extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote); + #endif |