| commit | 6fe666b2cef09571aa01d9ffae179472aeaf9378 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Aug 2025 18:27:13 +0000 (1 11:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 1 Aug 2025 18:27:14 +0000 (1 11:27 -0700) | ||
| tree | 67c34160a2459a37b7c08feb43dc004bc26c8b45 | treesnapshot (tar.gz zip) |
| parent | cbcde15e7316a28f9deb49b4f48e9748b5a903d2 | commitdiff |
| parent | e3378607c8675a2db6d997bd9781ae5500a2ec57 | commitdiff |
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
"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 | blobhistory |