]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'fc/pull-no-rebase-merges-theirs-into-ours'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Aug 2021 21:06:42 +0000 (14:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Aug 2021 21:06:42 +0000 (14:06 -0700)
Documentation fix for "git pull --rebase=no".

* fc/pull-no-rebase-merges-theirs-into-ours:
  doc: pull: fix rebase=false documentation


Trivial merge