diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-23 01:08:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-23 01:08:05 +0100 |
| commit | 1a545d0b5fa56a7be88fe082cec7847715079a18 (patch) | |
| tree | 721ec8d309c6aea0fa3a80eea8d5c1ad07f6bed1 /cache.h | |
| parent | Merge branch 'jc/maint-limit-note-output' (diff) | |
| parent | branch: warn and refuse to set a branch as a tracking branch of itself. (diff) | |
| download | git-1a545d0b5fa56a7be88fe082cec7847715079a18.tar.xz git-1a545d0b5fa56a7be88fe082cec7847715079a18.zip | |
Merge branch 'il/branch-set-upstream'
* il/branch-set-upstream:
branch: warn and refuse to set a branch as a tracking branch of itself.
Add branch --set-upstream
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -553,6 +553,7 @@ enum branch_track { BRANCH_TRACK_REMOTE, BRANCH_TRACK_ALWAYS, BRANCH_TRACK_EXPLICIT, + BRANCH_TRACK_OVERRIDE, }; enum rebase_setup_type { |