summaryrefslogtreecommitdiff
path: root/branch.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-03 22:29:55 -0800
committerJunio C Hamano <gitster@pobox.com>2009-03-03 22:58:52 -0800
commita9f2c13685ae9040d52d53cd719a18040f1dd123 (patch)
treef3d1738b9c775468fedac43d62d3289cbebf0fd6 /branch.h
parenta1070d4cbbf1002cc0b01afc3de06382deb0511a (diff)
downloadgit-a9f2c13685ae9040d52d53cd719a18040f1dd123.tar.gz
Make git-clone respect branch.autosetuprebase
When git-clone creates an initial branch it was not checking the branch.autosetuprebase configuration option (which may exist in ~/.gitconfig). Refactor the code used by "git branch" to create a new branch, and use it instead of the insufficiently duplicated code in builtin-clone. Changes are partly, and the test is mostly, based on the previous work by Pat Notz. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.h')
-rw-r--r--branch.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/branch.h b/branch.h
index 9f0c2a2c1f..eed817a64c 100644
--- a/branch.h
+++ b/branch.h
@@ -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