From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 Aug 2025 18:27:13 +0000 (-0700)
Subject: Merge branch 'ly/pull-autostash'
X-Git-Tag: v2.51.0-rc0~23
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6fe666b2cef09571aa01d9ffae179472aeaf9378;p=thirdparty%2Fgit.git

Merge branch 'ly/pull-autostash'

"git pull" learned to pay attention to pull.autostash configuration
variable, which overrides rebase/merge.autostash.

* ly/pull-autostash:
  pull: add pull.autoStash config option
---

6fe666b2cef09571aa01d9ffae179472aeaf9378