From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Aug 2021 21:06:42 +0000 (-0700)
Subject: Merge branch 'fc/pull-no-rebase-merges-theirs-into-ours'
X-Git-Tag: v2.33.0-rc0~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9fe413fc29efac6d223cf1bd0cad10231e37df3;p=thirdparty%2Fgit.git

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
---

e9fe413fc29efac6d223cf1bd0cad10231e37df3