]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c239410 e337860)
Merge branch 'ly/pull-autostash' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Jul 2025 23:06:24 +0000 (16:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Jul 2025 23:06:24 +0000 (16:06 -0700)
"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

1  2 
builtin/pull.c patch | diff1 | diff2 | blob | history

diff --cc builtin/pull.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.