git/Documentation
Lidong Yan e3378607c8 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>
2025-07-21 15:01:21 -07:00
..
RelNotes Hopefully final bits before 2.50 2025-06-13 13:29:15 -07:00
config pull: add pull.autoStash config option 2025-07-21 15:01:21 -07:00
howto git-zlib: use `struct z_stream_s` instead of typedef 2025-04-07 14:53:11 -07:00
includes
…
mergetools doc: convert git-mergetool options to new synopsis style 2025-05-27 07:51:01 -07:00
technical Merge branch 'wk/sparse-checkout-doc-fix' 2025-06-02 09:25:34 -07:00
.gitignore
…
BreakingChanges.adoc name-rev: remove "--stdin" support 2025-03-12 08:48:54 -07:00
CodingGuidelines doc: add markup for characters in Guidelines 2025-04-14 14:43:53 -07:00
DecisionMaking.adoc
…
Makefile Documentation: stop depending on Perl to generate command list 2025-04-16 07:30:30 -07:00
MyFirstContribution.adoc docs: replace git_config to repo_config 2025-05-19 10:53:12 -07:00
MyFirstObjectWalk.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
ReviewingGuidelines.adoc
…
SubmittingPatches
…
ToolsForGit.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
asciidoc.conf.in doc: fix asciidoctor synopsis processing of triple-dots 2025-04-14 14:43:52 -07:00
asciidoctor-extensions.rb.in doc: fix asciidoctor synopsis processing of triple-dots 2025-04-14 14:43:52 -07:00
blame-options.adoc blame: print unblamable and ignored commits in porcelain mode 2025-04-07 14:50:18 -07:00
build-docdep.perl doc: fix build-docdep.perl 2025-03-01 10:26:15 -08:00
cat-texi.perl
…
cmd-list.sh Documentation: stop depending on Perl to generate command list 2025-04-16 07:30:30 -07:00
config.adoc
…
date-formats.adoc
…
diff-format.adoc
…
diff-generate-patch.adoc
…
diff-options.adoc
…
doc-diff
…
docbook-xsl.css
…
docbook.xsl
…
docinfo-html.in
…
everyday.adoco
…
fetch-options.adoc
…
fix-texi.sh Documentation: stop depending on Perl to massage user manual 2025-04-16 07:30:29 -07:00
fsck-msgids.adoc packed-backend: fsck should warn when "packed-refs" file is empty 2025-05-14 12:32:58 -07:00
generate-mergetool-list.sh
…
git-add.adoc
…
git-am.adoc
…
git-annotate.adoc
…
git-apply.adoc
…
git-archimport.adoc
…
git-archive.adoc
…
git-backfill.adoc
…
git-bisect-lk2009.adoc
…
git-bisect.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
git-blame.adoc blame: print unblamable and ignored commits in porcelain mode 2025-04-07 14:50:18 -07:00
git-branch.adoc doc: branch: fix inline-verbatim 2025-05-05 10:48:07 -07:00
git-bugreport.adoc
…
git-bundle.adoc
…
git-cat-file.adoc cat-file: make --allow-unknown-type a noop 2025-05-16 09:43:09 -07:00
git-check-attr.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
git-check-ignore.adoc
…
git-check-mailmap.adoc
…
git-check-ref-format.adoc
…
git-checkout-index.adoc
…
git-checkout.adoc doc: convert git-checkout manpage to new style 2025-05-27 07:50:58 -07:00
git-cherry-pick.adoc
…
git-cherry.adoc
…
git-citool.adoc
…
git-clean.adoc
…
git-clone.adoc Merge branch 'ma/clone-doc-markup-fix' 2025-03-12 12:06:57 -07:00
git-column.adoc doc: column: fix blank lines around block delimiters 2025-06-01 17:20:16 -07:00
git-commit-graph.adoc
…
git-commit-tree.adoc
…
git-commit.adoc Merge branch 'mh/doc-commit-title-not-subject' 2025-02-25 14:19:36 -08:00
git-config.adoc Merge branch 'jc/doc-boolean-synonyms' 2025-02-21 10:35:53 -08:00
git-count-objects.adoc
…
git-credential-cache--daemon.adoc
…
git-credential-cache.adoc
…
git-credential-store.adoc
…
git-credential.adoc
…
git-cvsexportcommit.adoc
…
git-cvsimport.adoc
…
git-cvsserver.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
git-daemon.adoc git-daemon doc: update mark-up of synopsis option descriptions 2025-05-12 09:25:26 -07:00
git-describe.adoc
…
git-diagnose.adoc
…
git-diff-files.adoc
…
git-diff-index.adoc
…
git-diff-pairs.adoc builtin/diff-pairs: allow explicit diff queue flush 2025-03-03 08:17:47 -08:00
git-diff-tree.adoc
…
git-diff.adoc
…
git-difftool.adoc
…
git-fast-export.adoc fast-export: --signed-commits is experimental 2025-05-28 10:30:47 -07:00
git-fast-import.adoc fast-export: --signed-commits is experimental 2025-05-28 10:30:47 -07:00
git-fetch-pack.adoc
…
git-fetch.adoc
…
git-filter-branch.adoc
…
git-fmt-merge-msg.adoc
…
git-for-each-ref.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
git-for-each-repo.adoc
…
git-format-patch.adoc
…
git-fsck-objects.adoc
…
git-fsck.adoc Merge branch 'sj/ref-consistency-checks-more' 2025-03-26 16:26:10 +09:00
git-fsmonitor--daemon.adoc
…
git-gc.adoc
…
git-get-tar-commit-id.adoc
…
git-grep.adoc
…
git-gui.adoc
…
git-hash-object.adoc
…
git-help.adoc
…
git-hook.adoc
…
git-http-backend.adoc
…
git-http-fetch.adoc
…
git-http-push.adoc
…
git-imap-send.adoc
…
git-index-pack.adoc
…
git-init-db.adoc
…
git-init.adoc
…
git-instaweb.adoc
…
git-interpret-trailers.adoc
…
git-log.adoc
…
git-ls-files.adoc
…
git-ls-remote.adoc
…
git-ls-tree.adoc
…
git-mailinfo.adoc
…
git-mailsplit.adoc
…
git-maintenance.adoc doc: maintenance: fix linkgit syntax 2025-06-09 11:33:25 -07:00
git-merge-base.adoc
…
git-merge-file.adoc
…
git-merge-index.adoc
…
git-merge-one-file.adoc
…
git-merge-tree.adoc merge-tree: add a new --quiet flag 2025-05-16 15:09:14 -07:00
git-merge.adoc doc: convert git-merge manpage to new style 2025-05-27 07:50:59 -07:00
git-mergetool--lib.adoc
…
git-mergetool.adoc doc: convert git-mergetool manpage to new synopsis style 2025-05-27 07:51:01 -07:00
git-mktag.adoc
…
git-mktree.adoc
…
git-multi-pack-index.adoc midx docs: clarify tie breaking 2025-05-22 14:48:37 -07:00
git-mv.adoc doc: convert git-mv to new documentation format 2025-04-14 14:43:52 -07:00
git-name-rev.adoc
…
git-notes.adoc doc: notes: use stuck form throughout 2025-05-27 15:31:08 -07:00
git-p4.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
git-pack-objects.adoc
…
git-pack-redundant.adoc
…
git-pack-refs.adoc Merge branch 'pw/doc-pack-refs-markup-fix' 2025-04-07 14:23:19 -07:00
git-patch-id.adoc
…
git-prune-packed.adoc
…
git-prune.adoc
…
git-pull.adoc
…
git-push.adoc
…
git-quiltimport.adoc
…
git-range-diff.adoc
…
git-read-tree.adoc
…
git-rebase.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
git-receive-pack.adoc builtin/receive-pack: add option to skip connectivity check 2025-05-20 11:43:36 -07:00
git-reflog.adoc doc: reflog: fix `drop` subheading 2025-05-05 10:48:07 -07:00
git-refs.adoc Merge branch 'kn/ref-migrate-skip-reflog' 2025-02-27 15:23:00 -08:00
git-remote-ext.adoc
…
git-remote-fd.adoc
…
git-remote-helpers.adoco
…
git-remote.adoc
…
git-repack.adoc repack: begin combining cruft packs with `--combine-cruft-below-size` 2025-03-21 03:42:07 -07:00
git-replace.adoc
…
git-replay.adoc
…
git-request-pull.adoc
…
git-rerere.adoc
…
git-reset.adoc doc: convert git-reset to new documentation format 2025-04-14 14:43:51 -07:00
git-restore.adoc doc: restore: remove note on --patch w/ pathspecs 2025-03-18 09:03:42 -07:00
git-rev-list.adoc
…
git-rev-parse.adoc
…
git-revert.adoc
…
git-rm.adoc doc: convert git-rm to new documentation format 2025-04-14 14:43:52 -07:00
git-send-email.adoc Merge branch 'ag/doc-send-email' 2025-05-19 16:02:45 -07:00
git-send-pack.adoc
…
git-sh-i18n--envsubst.adoc
…
git-sh-i18n.adoc
…
git-sh-setup.adoc
…
git-shell.adoc
…
git-shortlog.adoc
…
git-show-branch.adoc
…
git-show-index.adoc
…
git-show-ref.adoc
…
git-show.adoc
…
git-sparse-checkout.adoc
…
git-stage.adoc
…
git-stash.adoc
…
git-status.adoc
…
git-stripspace.adoc doc: stripspace: mention where the default comes from 2025-05-27 15:31:05 -07:00
git-submodule.adoc
…
git-svn.adoc
…
git-switch.adoc doc: convert git-switch manpage to new synopsis style 2025-05-27 07:51:02 -07:00
git-symbolic-ref.adoc
…
git-tag.adoc
…
git-tools.adoc
…
git-unpack-file.adoc
…
git-unpack-objects.adoc
…
git-update-index.adoc
…
git-update-ref.adoc update-ref: add --batch-updates flag for stdin mode 2025-04-08 07:59:49 -07:00
git-update-server-info.adoc
…
git-upload-archive.adoc
…
git-upload-pack.adoc
…
git-var.adoc git-var doc: fix usage of $ENV_VAR vs ENV_VAR 2025-05-12 09:25:27 -07:00
git-verify-commit.adoc git-verify-* doc: update mark-up of synopsis option descriptions 2025-05-12 09:25:27 -07:00
git-verify-pack.adoc git-verify-* doc: update mark-up of synopsis option descriptions 2025-05-12 09:25:27 -07:00
git-verify-tag.adoc git-verify-* doc: update mark-up of synopsis option descriptions 2025-05-12 09:25:27 -07:00
git-version.adoc help: include unsafe SHA-1 build info in version 2025-04-07 14:39:27 -07:00
git-web--browse.adoc
…
git-whatchanged.adoc
…
git-worktree.adoc
…
git-write-tree.adoc git-{var,write-tree} docs: update mark-up of synopsis option descriptions 2025-05-12 09:25:26 -07:00
git.adoc Merge branch 'jc/doc-boolean-synonyms' 2025-02-21 10:35:53 -08:00
gitattributes.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
gitcli.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
gitcore-tutorial.adoc
…
gitcredentials.adoc docs: add credential helper for outlook and gmail in OAuth list of helpers 2025-05-08 11:07:07 -07:00
gitcvs-migration.adoc
…
gitdiffcore.adoc
…
giteveryday.adoc
…
gitfaq.adoc
…
gitformat-bundle.adoc
…
gitformat-chunk.adoc
…
gitformat-commit-graph.adoc
…
gitformat-index.adoc
…
gitformat-pack.adoc
…
gitformat-signature.adoc
…
gitglossary.adoc
…
githooks.adoc
…
gitignore.adoc
…
gitk.adoc
…
gitmailmap.adoc
…
gitmodules.adoc
…
gitnamespaces.adoc
…
gitpacking.adoc
…
gitprotocol-capabilities.adoc
…
gitprotocol-common.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
gitprotocol-http.adoc
…
gitprotocol-pack.adoc
…
gitprotocol-v2.adoc Merge branch 'cc/lop-remote' 2025-03-05 10:37:44 -08:00
gitremote-helpers.adoc
…
gitrepository-layout.adoc docs: fix repository-layout when building with breaking changes 2025-03-05 07:25:11 -08:00
gitrevisions.adoc
…
gitsubmodules.adoc
…
gittutorial-2.adoc
…
gittutorial.adoc
…
gitweb.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
gitweb.conf.adoc doc: add a blank line around block delimiters 2025-03-10 09:58:06 -07:00
gitworkflows.adoc
…
glossary-content.adoc
…
i18n.adoc
…
install-doc-quick.sh
…
install-webdoc.sh
…
line-range-format.adoc
…
line-range-options.adoc
…
lint-fsck-msgids.perl
…
lint-gitlink.perl
…
lint-man-end-blurb.perl
…
lint-man-section-order.perl
…
lint-manpages.sh
…
manpage-bold-literal.xsl
…
manpage-normal.xsl
…
manpage.xsl
…
merge-options.adoc doc: merge-options.adoc remove a misleading double negation 2025-05-27 07:51:00 -07:00
merge-strategies.adoc doc: convert merge strategies to synopsis format 2025-05-27 07:51:00 -07:00
meson.build Merge branch 'ps/fewer-perl' 2025-04-29 14:21:31 -07:00
object-format-disclaimer.adoc
…
pretty-formats.adoc Merge branch 'jc/doc-boolean-synonyms' 2025-02-21 10:35:53 -08:00
pretty-options.adoc
…
pull-fetch-param.adoc
…
ref-reachability-filters.adoc
…
ref-storage-format.adoc
…
rerere-options.adoc doc: convert merge options to new synopsis format 2025-05-27 07:50:59 -07:00
rev-list-description.adoc
…
rev-list-options.adoc Merge branch 'jt/rev-list-z' 2025-04-16 13:54:18 -07:00
revisions.adoc
…
scalar.adoc scalar reconfigure: improve --maintenance docs 2025-05-14 12:18:12 -07:00
sequencer.adoc
…
signoff-option.adoc
…
texi.xsl
…
trace2-target-values.adoc
…
transfer-data-leaks.adoc
…
urls-remotes.adoc
…
urls.adoc
…
user-manual.adoc
…