diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-28 00:02:57 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-28 00:02:57 +0300 |
commit | 60b188a9844cdcf865174c685a38acc053a9d43b (patch) | |
tree | b2ad8b5b4b20785ea137fa0ec5a11cb0b8517d8c /cache.h | |
parent | 5a4d707a6d914fcea302e299fc18892d9e42c767 (diff) | |
parent | 572fc81d21b26d856dd3c2cc366b7452a4ed16e4 (diff) |
Merge branch 'js/branch-track'
* js/branch-track:
doc: documentation update for the branch track changes
branch: optionally setup branch.*.merge from upstream local branches
Conflicts:
Documentation/config.txt
Documentation/git-branch.txt
Documentation/git-checkout.txt
builtin-branch.c
cache.h
t/t7201-co.sh
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -425,6 +425,15 @@ enum safe_crlf { extern enum safe_crlf safe_crlf; +enum branch_track { + BRANCH_TRACK_NEVER = 0, + BRANCH_TRACK_REMOTE, + BRANCH_TRACK_ALWAYS, + BRANCH_TRACK_EXPLICIT, +}; + +extern enum branch_track git_branch_track; + #define GIT_REPO_VERSION 0 extern int repository_format_version; extern int check_repository_format(void); |