From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 5 Feb 2022 17:42:28 +0000 (-0800)
Subject: Merge branch 'pb/pull-rebase-autostash-fix'
X-Git-Tag: v2.36.0-rc0~194
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=7a9ae6d0d9cf979a2b1a018135370dd6331e505c

Merge branch 'pb/pull-rebase-autostash-fix'

"git pull --rebase" ignored the rebase.autostash configuration
variable when the remote history is a descendant of our history,
which has been corrected.

* pb/pull-rebase-autostash-fix:
  pull --rebase: honor rebase.autostash when fast-forwarding
---

7a9ae6d0d9cf979a2b1a018135370dd6331e505c