Julia Evans 59b28f928b doc: git-pull: clarify options for integrating remote branch ...

From user feedback:

- One user is confused about the current default ("I was convinced that
  the git default was still to merge on pull")
- One user is confused about why "git fetch" isn't mentioned earlier
- One user says they always forget what the arguments to `git pull` are
  and that it's not immediately obvious that `--no-rebase` means "merge"
- One user wants `--ff-only` to be mentioned

Resolve this by listing the options for integrating the the remote
branch. This should help users figure out at a glance which one they
want to do, and make it clearer that --ff-only is the default.

Signed-off-by: Julia Evans <julia@jvns.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2025-10-15 13:17:52 -07:00

..

config

Merge branch 'km/alias-doc-markup-fix'

2025-09-12 10:41:20 -07:00

howto

git-zlib: use struct z_stream_s instead of typedef

2025-04-07 14:53:11 -07:00

includes

…

mergetools

doc: check well-formedness of delimited sections

2025-08-11 14:16:03 -07:00

RelNotes

The eighth batch

2025-09-12 10:41:21 -07:00

technical

doc: check for absence of multiple terms in each entry of desc list

2025-08-11 14:16:04 -07:00

.gitignore

…

asciidoc.conf.in

doc: git-log: convert rev list options to new doc format

2025-07-07 13:45:00 -07:00

asciidoctor-extensions.rb.in

doc: git-log: convert rev list options to new doc format

2025-07-07 13:45:00 -07:00

blame-options.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

BreakingChanges.adoc

BreakingChanges: announce switch to "reftable" format

2025-07-07 06:26:21 -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

CodingGuidelines

Merge branch 'jc/doc-release-vs-clear'

2025-08-04 08:10:35 -07:00

config.adoc

…

date-formats.adoc

…

DecisionMaking.adoc

…

diff-context-options.adoc

add-patch: add diff.context command line overrides

2025-07-29 08:52:45 -07:00

diff-format.adoc

doc: check well-formedness of delimited sections

2025-08-11 14:16:03 -07:00

diff-generate-patch.adoc

Merge branch 'ma/doc-diff-cc-headers'

2025-06-18 13:53:34 -07:00

diff-options.adoc

Merge branch 'ja/doc-lint-sections-and-synopsis'

2025-08-25 14:22:02 -07:00

doc-diff

…

docbook-xsl.css

…

docbook.xsl

…

docinfo-html.in

…

everyday.adoco

…

fetch-options.adoc

Merge branch 'kh/doc-markup-fixes'

2025-09-12 10:41:20 -07:00

fix-texi.sh

Documentation: stop depending on Perl to massage user manual

2025-04-16 07:30:29 -07:00

for-each-ref-options.adoc

Merge branch 'ja/doc-lint-sections-and-synopsis'

2025-08-25 14:22:02 -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

doc: rephrase the purpose of the staging area

2025-08-29 10:21:08 -07:00

git-am.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-annotate.adoc

…

git-apply.adoc

apply docs: clarify wording for --intent-to-add

2025-07-07 06:41:11 -07:00

git-archimport.adoc

…

git-archive.adoc

…

git-backfill.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

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

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-check-attr.adoc

doc: check for absence of multiple terms in each entry of desc list

2025-08-11 14:16:04 -07:00

git-check-ignore.adoc

doc: check for absence of multiple terms in each entry of desc list

2025-08-11 14:16:04 -07:00

git-check-mailmap.adoc

…

git-check-ref-format.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-checkout-index.adoc

…

git-checkout.adoc

doc lint: check that synopsis manpages have synopsis inlines

2025-08-11 14:16:04 -07:00

git-cherry-pick.adoc

…

git-cherry.adoc

…

git-citool.adoc

…

git-clean.adoc

…

git-clone.adoc

Merge branch 'ja/doc-lint-sections-and-synopsis'

2025-08-25 14:22:02 -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

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-commit-tree.adoc

…

git-commit.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-config.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-count-objects.adoc

Merge branch 'ds/doc-count-objects-fix'

2025-08-25 14:22:03 -07:00

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

diff --no-index: support limiting by pathspec

2025-05-22 14:20:11 -07:00

git-difftool.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-fast-export.adoc

fast-(import|export): improve on commit signature output format

2025-07-09 16:08:29 -07:00

git-fast-import.adoc

Merge branch 'kh/doc-markup-fixes'

2025-09-12 10:41:20 -07:00

git-fetch-pack.adoc

…

git-fetch.adoc

…

git-filter-branch.adoc

…

git-fmt-merge-msg.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-for-each-ref.adoc

Merge branch 'ja/doc-lint-sections-and-synopsis'

2025-08-25 14:22:02 -07:00

git-for-each-repo.adoc

…

git-format-patch.adoc

Merge branch 'js/doc-sending-patch-via-thunderbird'

2025-09-02 08:21:26 -07:00

git-fsck-objects.adoc

…

git-fsck.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-fsmonitor--daemon.adoc

…

git-gc.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

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

doc: check for absence of multiple terms in each entry of desc list

2025-08-11 14:16:04 -07:00

git-http-push.adoc

…

git-imap-send.adoc

docs: explain how to use git imap-send --list command to get a list of available folders

2025-07-22 08:49:15 -07:00

git-index-pack.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-init-db.adoc

…

git-init.adoc

…

git-instaweb.adoc

…

git-interpret-trailers.adoc

doc: interpret-trailers: close all pairs of single quotes

2025-08-22 11:12:27 -07:00

git-last-modified.adoc

last-modified: new subcommand to show when files were last modified

2025-08-28 16:44:58 -07:00

git-log.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

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

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-merge.adoc

Merge branch 'ts/merge-orig-head-doc-fix'

2025-07-14 11:19:28 -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

Merge branch 'kh/doc-markup-fixes'

2025-09-12 10:41:20 -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: check well-formedness of delimited sections

2025-08-11 14:16:03 -07:00

git-pack-objects.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-pack-redundant.adoc

…

git-pack-refs.adoc

Merge branch 'ps/doc-pack-refs-auto-with-files-backend-fix'

2025-07-16 09:42:28 -07:00

git-patch-id.adoc

…

git-prune-packed.adoc

…

git-prune.adoc

…

git-pull.adoc

doc: git-pull: clarify options for integrating remote branch

2025-10-15 13:17:52 -07:00

git-push.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-quiltimport.adoc

…

git-range-diff.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-read-tree.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-rebase.adoc

Merge branch 'je/doc-rebase'

2025-08-28 11:28:57 -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

builtin/reflog: implement subcommand to write new entries

2025-08-06 07:36:30 -07:00

git-refs.adoc

Merge branch 'ms/refs-exists'

2025-09-12 10:41:19 -07:00

git-remote-ext.adoc

…

git-remote-fd.adoc

…

git-remote-helpers.adoco

…

git-remote.adoc

…

git-repack.adoc

Merge branch 'ds/path-walk-2'

2025-06-17 10:44:38 -07:00

git-replace.adoc

…

git-replay.adoc

…

git-repo.adoc

repo: add the --format flag

2025-08-17 09:13:41 -07:00

git-request-pull.adoc

…

git-rerere.adoc

…

git-reset.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-restore.adoc

Merge branch 'lm/add-p-context'

2025-08-04 08:10:33 -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

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

git-send-pack.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

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

Merge branch 'lm/add-p-context'

2025-08-04 08:10:33 -07:00

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

Merge branch 'ja/doc-lint-sections-and-synopsis'

2025-08-25 14:22:02 -07:00

git-svn.adoc

doc: check well-formedness of delimited sections

2025-08-11 14:16:03 -07:00

git-switch.adoc

builtin: unmark git-switch and git-restore as experimental

2025-07-28 14:24:03 -07:00

git-symbolic-ref.adoc

…

git-tag.adoc

…

git-tools.adoc

…

git-unpack-file.adoc

…

git-unpack-objects.adoc

…

git-update-index.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

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

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

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

whatschanged: list it in BreakingChanges document

2025-05-12 15:30:12 -07:00

git-worktree.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

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

progress: pay attention to (customized) delay time

2025-08-25 15:50:17 -07: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: remove credential helper links for emails from gitcredentials

2025-05-30 10:23:37 -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

Merge branch 'js/doc-gitk-history'

2025-08-29 09:44:38 -07:00

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

doc: check well-formedness of delimited sections

2025-08-11 14:16:03 -07:00

gitprotocol-pack.adoc

…

gitprotocol-v2.adoc

doc: update references to renamed AsciiDoc files

2025-06-06 15:05:47 -07:00

gitremote-helpers.adoc

Merge branch 'bs/remote-helpers-doc-markup-fix'

2025-07-14 11:19:22 -07:00

gitrepository-layout.adoc

docs: fix repository-layout when building with breaking changes

2025-03-05 07:25:11 -08:00

gitrevisions.adoc

…

gitsubmodules.adoc

doc: check well-formedness of delimited sections

2025-08-11 14:16:03 -07:00

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: test linkgit macros for well-formedness

2025-08-11 14:16:03 -07:00

gitworkflows.adoc

…

glossary-content.adoc

doc: correct doc for glob pathspec

2025-07-11 09:44:06 -07:00

i18n.adoc

…

install-doc-quick.sh

…

install-webdoc.sh

…

line-range-format.adoc

doc: git-log: convert line range format to new doc format

2025-07-07 13:45:00 -07:00

line-range-options.adoc

doc: git-log: convert line range options to new doc format

2025-07-07 13:45:00 -07:00

lint-delimited-sections.perl

doc: check well-formedness of delimited sections

2025-08-11 14:16:03 -07:00

lint-documentation-style.perl

doc lint: check that synopsis manpages have synopsis inlines

2025-08-11 14:16:04 -07:00

lint-fsck-msgids.perl

…

lint-gitlink.perl

doc: test linkgit macros for well-formedness

2025-08-11 14:16:03 -07:00

lint-man-end-blurb.perl

…

lint-man-section-order.perl

…

lint-manpages.sh

…

Makefile

doc: check for absence of multiple terms in each entry of desc list

2025-08-11 14:16:04 -07:00

manpage-bold-literal.xsl

…

manpage-normal.xsl

…

manpage.xsl

…

merge-options.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

merge-strategies.adoc

doc: convert merge strategies to synopsis format

2025-05-27 07:51:00 -07:00

meson.build

Merge branch 'tc/last-modified'

2025-09-08 14:54:35 -07:00

MyFirstContribution.adoc

Merge branch 'ds/doc-ggg-pr-fork-clarify'

2025-09-02 08:21:27 -07:00

MyFirstObjectWalk.adoc

Merge branch 'jc/you-still-use-whatchanged'

2025-06-25 14:07:35 -07:00

object-format-disclaimer.adoc

…

pretty-formats.adoc

doc: fix asciidoc format compatibility in pretty-formats.adoc

2025-08-20 14:35:31 -07:00

pretty-options.adoc

Merge branch 'ja/doc-git-log-markup'

2025-07-21 09:14:28 -07:00

pull-fetch-param.adoc

doc: git-pull: move <repository> and <refspec> params

2025-10-15 13:17:52 -07:00

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

doc: git-log convert rev-list-description to new doc format

2025-07-07 13:45:00 -07:00

rev-list-options.adoc

Merge branch 'ja/doc-git-log-markup'

2025-07-21 09:14:28 -07:00

ReviewingGuidelines.adoc

…

revisions.adoc

…

scalar.adoc

doc: check for absence of the form --[no-]parameter

2025-08-11 14:16:04 -07:00

sequencer.adoc

…

signoff-option.adoc

…

SubmittingPatches

SubmittingPatches: allow non-real name contributions

2025-07-16 07:35:45 -07:00

texi.xsl

…

ToolsForGit.adoc

doc: add a blank line around block delimiters

2025-03-10 09:58:06 -07:00

trace2-target-values.adoc

…

transfer-data-leaks.adoc

…

urls-remotes.adoc

…

urls.adoc

…

user-manual.adoc

config: drop git_config() wrapper

2025-07-23 08:15:18 -07:00