summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-04-17 10:28:17 -0700
committerJunio C Hamano <gitster@pobox.com>2025-04-17 10:28:17 -0700
commitb45113f5818b26bf22b85988f9ef7ff2da06d4a1 (patch)
treec7fa852ecfd618919e8888eaa2c3c0d314f2fbd8 /merge-recursive.c
parentc152ae3ef50dc7bbbf5089571df5bba404a96e0d (diff)
parentf9356f9cb4c2c9c6baab30c1a8579445fddfe502 (diff)
Merge branch 'jk/fetch-follow-remote-head-fix'
"git fetch [<remote>]" with only the configured fetch refspec should be the only thing to update refs/remotes/<remote>/HEAD, but the code was overly eager to do so in other cases. * jk/fetch-follow-remote-head-fix: fetch: make set_head() call easier to read fetch: don't ask for remote HEAD if followRemoteHEAD is "never" fetch: only respect followRemoteHEAD with configured refspecs
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions