]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cbcde15 e337860)
Merge branch 'ly/pull-autostash'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Aug 2025 18:27:13 +0000 (11:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Aug 2025 18:27:14 +0000 (11:27 -0700)
commit6fe666b2cef09571aa01d9ffae179472aeaf9378
tree67c34160a2459a37b7c08feb43dc004bc26c8b45tree | snapshot
parentcbcde15e7316a28f9deb49b4f48e9748b5a903d2commit | diff
parente3378607c8675a2db6d997bd9781ae5500a2ec57commit | diff
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
builtin/pull.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.