From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Dec 2020 08:18:06 +0000 (-0800)
Subject: Merge branch 'pb/pull-rebase-recurse-submodules'
X-Git-Tag: v2.30.0-rc0~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c692e1b6731da33ebfc2dfd72476057cd16aceb9;p=thirdparty%2Fgit.git

Merge branch 'pb/pull-rebase-recurse-submodules'

"git pull --rebase --recurse-submodules" checked for local changes
in a wrong range and failed to run correctly when it should.

* pb/pull-rebase-recurse-submodules:
  pull: check for local submodule modifications with the right range
  t5572: describe '--rebase' tests a little more
  t5572: add notes on a peculiar test
  pull --rebase: compute rebase arguments in separate function
---

c692e1b6731da33ebfc2dfd72476057cd16aceb9