summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-02 15:57:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-02 15:57:26 -0700
commitdb400949b31a5d2cec923b4c9da710fbdd52cca2 (patch)
treee707343e71761c2a3031f4009a7db4d09c581af6 /mergetools
parentMerge branch 'tr/coverage' (diff)
parentfetch: don't try to update unfetched tracking refs (diff)
downloadtgif-db400949b31a5d2cec923b4c9da710fbdd52cca2.tar.xz
Merge branch 'jk/fetch-always-update-tracking'
"git fetch origin master" unlike "git fetch origin" or "git fetch" did not update "refs/remotes/origin/master"; this was an early design decision to keep the update of remote tracking branches predictable, but in practice it turns out that people find it more convenient to opportunisticly update them whenever we have a chance, and we have been updating them when we run "git push" which already breaks the original "predictability" anyway. Now such a fetch does update refs/remotes/origin/master. * jk/fetch-always-update-tracking: fetch: don't try to update unfetched tracking refs fetch: opportunistically update tracking refs refactor "ref->merge" flag fetch/pull doc: untangle meaning of bare <ref> t5510: start tracking-ref tests from a known state
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions