summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-08-02 14:06:42 -0700
committerJunio C Hamano <gitster@pobox.com>2021-08-02 14:06:42 -0700
commite9fe413fc29efac6d223cf1bd0cad10231e37df3 (patch)
treec49068a8158edbbd95e494393086437c2ec753b1 /cache.h
parent107687b5af43ef2c8ef2051b895feae0951fe6cc (diff)
parentd3236bececc24d4b8ddc736d278ce0d3d5ff12d6 (diff)
Merge branch 'fc/pull-no-rebase-merges-theirs-into-ours'
Documentation fix for "git pull --rebase=no". * fc/pull-no-rebase-merges-theirs-into-ours: doc: pull: fix rebase=false documentation
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions