diff options
| author | Lidong Yan <yldhome2d2@gmail.com> | 2025-07-20 20:43:34 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-21 15:01:21 -0700 |
| commit | e3378607c8675a2db6d997bd9781ae5500a2ec57 (patch) | |
| tree | d75190749bc4dbe2e2dad5da071a895a9b7a93fa /builtin/commit-tree.c | |
| parent | 16bd9f20a403117f2e0d9bcda6c6e621d3763e77 (diff) | |
pull: add pull.autoStash config option
Git uses `rebase.autostash` or `merge.autostash` to determine whether a
dirty worktree is allowed during pull. However, this behavior is not
clearly documented, making it difficult for users to discover how to
enable autostash, or causing them to unknowingly enable it. Add new
config option `pull.autostash` along with its documentation and test
cases.
`pull.autostash` provides the same functionality as `rebase.autostash`
and `merge.autostash`, but overrides them when set. If `pull.autostash`
is not set, it falls back to `rebase.autostash` or `merge.autostash`,
depending on the value of `pull.rebase`.
Signed-off-by: Lidong Yan <yldhome2d2@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions