diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-12-19 10:58:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-19 10:58:30 -0800 |
| commit | a1f34d5955035dc64f2e25da0ba2cc0a0c73c21c (patch) | |
| tree | 0ef621c787630848212eb27671891bc9ba2a2a58 /advice.c | |
| parent | ae75cefd94075045edeb1d23283a47e4e48a9360 (diff) | |
| parent | 012bc566bad79876f4809d1e730a348b419772d0 (diff) | |
| download | git-a1f34d5955035dc64f2e25da0ba2cc0a0c73c21c.tar.gz | |
Merge branch 'bf/fetch-set-head-config'
"git fetch" honors "remote.<remote>.followRemoteHEAD" settings to
tweak the remote-tracking HEAD in "refs/remotes/<remote>/HEAD".
* bf/fetch-set-head-config:
remote set-head: set followRemoteHEAD to "warn" if "always"
fetch set_head: add warn-if-not-$branch option
fetch set_head: move warn advice into advise_if_enabled
fetch: add configuration for set_head behaviour
Diffstat (limited to 'advice.c')
| -rw-r--r-- | advice.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -53,6 +53,7 @@ static struct { [ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge" }, [ADVICE_DETACHED_HEAD] = { "detachedHead" }, [ADVICE_DIVERGING] = { "diverging" }, + [ADVICE_FETCH_SET_HEAD_WARN] = { "fetchRemoteHEADWarn" }, [ADVICE_FETCH_SHOW_FORCED_UPDATES] = { "fetchShowForcedUpdates" }, [ADVICE_FORCE_DELETE_BRANCH] = { "forceDeleteBranch" }, [ADVICE_GRAFT_FILE_DEPRECATED] = { "graftFileDeprecated" }, |