mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
031e2f7ae195069d00d21cde906fce5b0318dbdd
git/Documentation
History
Elijah Newren 031e2f7ae1 pull: abort by default when fast-forwarding is not possible 
We have for some time shown a long warning when the user does not
specify how to reconcile divergent branches with git pull.  Make it an
error now.

Initial-patch-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-07-22 11:54:29 -07:00
..
config
Merge branch 'fc/push-simple-updates'
2021-07-13 16:52:49 -07:00
howto
Document how we do embargoed releases
2021-03-27 15:13:12 -07:00
RelNotes
The fourth batch
2021-07-13 16:52:53 -07:00
technical
Merge branch 'ar/typofix'
2021-07-08 13:14:59 -07:00
.gitattributes
…
.gitignore
…
asciidoc.conf
…
asciidoctor-extensions.rb
…
blame-options.txt
blame-options.txt: camelcase blame.blankBoundary
2021-02-24 15:21:25 -08:00
build-docdep.perl
…
cat-texi.perl
…
cmd-list.perl
…
CodingGuidelines
Merge branch 'jc/test-allows-local'
2021-05-11 15:27:22 +09:00
config.txt
Merge branch 'km/config-doc-typofix'
2021-03-19 15:25:38 -07:00
date-formats.txt
doc: mention approxidates for git-commit --date
2021-02-23 13:33:02 -08:00
diff-format.txt
…
diff-generate-patch.txt
doc: point to diff attribute in patch format docs
2021-04-28 13:34:44 +09:00
diff-options.txt
Merge branch 'so/log-m-implies-p'
2021-06-14 13:33:27 +09:00
doc-diff
…
docbook-xsl.css
…
docbook.xsl
…
everyday.txto
…
fetch-options.txt
fetch: add --prefetch option
2021-04-16 13:36:55 -07:00
fix-texi.perl
…
git-add.txt
…
git-am.txt
am: learn to process quoted lines that ends with CRLF
2021-05-10 15:06:22 +09:00
git-annotate.txt
…
git-apply.txt
git-apply: allow simultaneous --cached and --3way options
2021-04-07 22:20:33 -07:00
git-archimport.txt
…
git-archive.txt
archive: add --add-file
2020-09-19 15:56:06 -07:00
git-bisect-lk2009.txt
git-bisect-lk2009: make continuation of list indented
2020-10-08 14:01:15 -07:00
git-bisect.txt
bisect: swap command-line options in documentation
2020-08-28 14:06:06 -07:00
git-blame.txt
mailmap doc: create a new "gitmailmap(5)" man page
2021-01-12 14:04:39 -08:00
git-branch.txt
Merge branch 'jc/maint-column-doc-typofix'
2021-02-25 16:43:30 -08:00
git-bugreport.txt
…
git-bundle.txt
…
git-cat-file.txt
git-cat-file.txt: remove references to "sha1"
2021-03-03 16:43:06 -08:00
git-check-attr.txt
…
git-check-ignore.txt
…
git-check-mailmap.txt
check-mailmap doc: note config options
2021-01-12 14:04:40 -08:00
git-check-ref-format.txt
…
git-checkout-index.txt
…
git-checkout.txt
Merge branch 'dl/checkout-guess'
2020-10-27 15:09:51 -07:00
git-cherry-pick.txt
Documentation: stylistically normalize references to Signed-off-by:
2020-10-20 11:57:40 -07:00
git-cherry.txt
…
git-citool.txt
…
git-clean.txt
…
git-clone.txt
builtin/clone.c: add --reject-shallow option
2021-04-01 12:58:58 -07:00
git-column.txt
…
git-commit-graph.txt
Merge branch 'ds/commit-graph-merging-fix'
2020-11-02 13:17:39 -08:00
git-commit-tree.txt
…
git-commit.txt
Documentation: fix typo in the --patch option of the commit command
2021-06-28 13:08:25 -07:00
git-config.txt
config: allow overriding of global and system configuration
2021-04-19 14:16:59 -07:00
git-count-objects.txt
…
git-credential-cache--daemon.txt
…
git-credential-cache.txt
…
git-credential-store.txt
…
git-credential.txt
doc lint: lint and fix missing "GIT" end sections
2021-04-10 23:36:34 -07:00
git-cvsexportcommit.txt
…
git-cvsimport.txt
…
git-cvsserver.txt
docs: fix linting issues due to incorrect relative section order
2021-04-10 23:36:34 -07:00
git-daemon.txt
…
git-describe.txt
describe-doc: clarify default length of abbreviation
2021-05-17 15:56:29 +09:00
git-diff-files.txt
…
git-diff-index.txt
builtin/diff-index: learn --merge-base
2020-09-20 21:30:26 -07:00
git-diff-tree.txt
builtin/diff-tree: learn --merge-base
2020-09-21 13:37:03 -07:00
git-diff.txt
builtin/diff-tree: learn --merge-base
2020-09-21 13:37:03 -07:00
git-difftool.txt
difftool.c: learn a new way start at specified file
2021-02-22 13:35:49 -08:00
git-fast-export.txt
…
git-fast-import.txt
fast-import: fix typo in documentation
2020-10-04 12:56:29 -07:00
git-fetch-pack.txt
…
git-fetch.txt
fetch: allow refspecs specified through stdin
2020-08-18 13:25:05 -07:00
git-filter-branch.txt
filter-branch doc: fix filter-repo typo
2020-10-20 12:22:25 -07:00
git-fmt-merge-msg.txt
…
git-for-each-ref.txt
ref-filter: use pretty.c logic for trailers
2021-02-15 16:48:38 -08:00
git-for-each-repo.txt
for-each-repo: run subcommands on configured repos
2020-09-25 10:59:44 -07:00
git-format-patch.txt
Merge branch 'jk/doc-format-patch-skips-merges'
2021-05-11 15:27:23 +09:00
git-fsck-objects.txt
…
git-fsck.txt
fsck doc: remove ancient out-of-date diagnostics
2021-01-20 19:10:42 -08:00
git-gc.txt
docs: clarify that refs/notes/ do not keep the attached objects alive
2021-02-10 23:43:55 -08:00
git-get-tar-commit-id.txt
…
git-grep.txt
docs: fix linting issues due to incorrect relative section order
2021-04-10 23:36:34 -07:00
git-gui.txt
…
git-hash-object.txt
…
git-help.txt
…
git-http-backend.txt
…
git-http-fetch.txt
http-fetch: allow custom index-pack args
2021-02-22 12:07:40 -08:00
git-http-push.txt
…
git-imap-send.txt
git-imap-send.txt: add note about localized Gmail folders
2020-08-31 11:44:33 -07:00
git-index-pack.txt
Merge branch 'jt/transfer-fsck-across-packs'
2021-03-01 14:02:57 -08:00
git-init-db.txt
…
git-init.txt
init: document init.defaultBranch better
2020-12-13 15:53:50 -08:00
git-instaweb.txt
…
git-interpret-trailers.txt
trailer: add new .cmd config option
2021-05-04 12:09:43 +09:00
git-log.txt
doc/log: correct default for --decorate
2021-06-08 13:34:48 +09:00
git-ls-files.txt
ls-files.c: add --deduplicate option
2021-01-23 11:48:20 -08:00
git-ls-remote.txt
…
git-ls-tree.txt
doc: clarify that --abbrev=<n> is about the minimum length
2020-11-04 14:04:44 -08:00
git-mailinfo.txt
mailinfo: allow stripping quoted CR without warning
2021-05-10 15:06:22 +09:00
git-mailsplit.txt
…
git-maintenance.txt
maintenance: use 'git fetch --prefetch'
2021-04-16 13:36:55 -07:00
git-merge-base.txt
…
git-merge-file.txt
…
git-merge-index.txt
…
git-merge-one-file.txt
…
git-merge-tree.txt
…
git-merge.txt
…
git-mergetool--lib.txt
mergetool: break setup_tool out into separate initialization function
2021-02-09 14:09:16 -08:00
git-mergetool.txt
doc: describe mergetool configuration in git-mergetool(1)
2021-03-13 15:34:32 -08:00
git-mktag.txt
docs: fix linting issues due to incorrect relative section order
2021-04-10 23:36:34 -07:00
git-mktree.txt
…
git-multi-pack-index.txt
midx: allow marking a pack as preferred
2021-04-01 13:07:37 -07:00
git-mv.txt
…
git-name-rev.txt
…
git-notes.txt
…
git-p4.txt
doc lint: lint and fix missing "GIT" end sections
2021-04-10 23:36:34 -07:00
git-pack-objects.txt
Merge branch 'jk/doc-max-pack-size'
2021-07-08 13:15:03 -07:00
git-pack-redundant.txt
…
git-pack-refs.txt
…
git-patch-id.txt
…
git-prune-packed.txt
…
git-prune.txt
…
git-pull.txt
pull: abort by default when fast-forwarding is not possible
2021-07-22 11:54:29 -07:00
git-push.txt
Documentation/git-push.txt: correct configuration typo
2021-03-13 15:41:45 -08:00
git-quiltimport.txt
…
git-range-diff.txt
Merge branch 'js/range-diff-one-side-only'
2021-02-17 17:21:41 -08:00
git-read-tree.txt
…
git-rebase.txt
Merge branch 'ab/rebase-no-reschedule-failed-exec'
2021-05-07 12:47:40 +09:00
git-receive-pack.txt
…
git-reflog.txt
…
git-remote-ext.txt
…
git-remote-fd.txt
…
git-remote-helpers.txto
…
git-remote.txt
remote: add meaningful exit code on missing/existing
2020-10-27 11:40:33 -07:00
git-repack.txt
Merge branch 'jk/doc-max-pack-size'
2021-07-08 13:15:03 -07:00
git-replace.txt
…
git-request-pull.txt
…
git-rerere.txt
…
git-reset.txt
…
git-restore.txt
Doc: document "A...B" form for <tree-ish> in checkout and switch
2020-10-07 09:49:05 -07:00
git-rev-list.txt
docs/rev-list: add some examples of --disk-usage
2021-02-17 16:25:29 -08:00
git-rev-parse.txt
rev-parse: add option for absolute or relative path formatting
2020-12-12 23:35:51 -08:00
git-revert.txt
Documentation: stylistically normalize references to Signed-off-by:
2020-10-20 11:57:40 -07:00
git-rm.txt
rm: honor sparse checkout patterns
2021-04-08 14:18:03 -07:00
git-send-email.txt
git-send-email: add option to specify sendmail command
2021-05-17 07:06:13 +09:00
git-send-pack.txt
…
git-sh-i18n--envsubst.txt
…
git-sh-i18n.txt
…
git-sh-setup.txt
…
git-shell.txt
…
git-shortlog.txt
mailmap: only look for .mailmap in work tree
2021-02-10 13:34:51 -08:00
git-show-branch.txt
…
git-show-index.txt
Documentation: mark --object-format=sha256 as experimental
2020-08-17 10:50:14 -07:00
git-show-ref.txt
…
git-show.txt
doc/git-show: include --diff-merges description
2020-12-21 13:47:32 -08:00
git-sparse-checkout.txt
sparse-checkout: toggle sparse index from builtin
2021-03-30 12:57:48 -07:00
git-stage.txt
…
git-stash.txt
stash show: use stash.showIncludeUntracked even when diff options given
2021-05-22 17:56:46 +09:00
git-status.txt
Documentation: typofix --column description
2021-02-19 19:36:47 -08:00
git-stripspace.txt
…
git-submodule.txt
…
git-svn.txt
docs: fix linting issues due to incorrect relative section order
2021-04-10 23:36:34 -07:00
git-switch.txt
checkout: learn to respect checkout.guess
2020-10-08 09:25:29 -07:00
git-symbolic-ref.txt
…
git-tag.txt
Documentation: typofix --column description
2021-02-19 19:36:47 -08:00
git-tools.txt
…
git-unpack-file.txt
…
git-unpack-objects.txt
…
git-update-index.txt
doc: remove "directory cache" from man pages
2021-01-09 22:57:24 -08:00
git-update-ref.txt
update-ref: allow creation of multiple transactions
2020-11-16 13:44:01 -08:00
git-update-server-info.txt
…
git-upload-archive.txt
…
git-upload-pack.txt
…
git-var.txt
…
git-verify-commit.txt
…
git-verify-pack.txt
…
git-verify-tag.txt
…
git-web--browse.txt
…
git-whatchanged.txt
…
git-worktree.txt
git-worktree.txt: fix typo in example path
2021-06-28 10:05:15 -07:00
git-write-tree.txt
…
git.txt
Merge branch 'ps/config-global-override'
2021-05-07 12:47:39 +09:00
gitattributes.txt
docs: document symlink restrictions for dot-files
2021-05-04 11:52:03 +09:00
gitcli.txt
…
gitcore-tutorial.txt
…
gitcredentials.txt
…
gitcvs-migration.txt
…
gitdiffcore.txt
Merge branch 'en/ort-perf-batch-8'
2021-03-22 14:00:24 -07:00
giteveryday.txt
…
gitfaq.txt
docs: explain how to deal with files that are always modified
2020-09-20 21:29:02 -07:00
gitglossary.txt
…
githooks.txt
githooks.txt: clarify documentation on reference-transaction hook
2021-03-01 09:02:01 -08:00
gitignore.txt
docs: document symlink restrictions for dot-files
2021-05-04 11:52:03 +09:00
gitk.txt
doc: log, gitk: move '-L' description to 'line-range-options.txt'
2020-11-01 15:54:14 -08:00
gitmailmap.txt
docs: document symlink restrictions for dot-files
2021-05-04 11:52:03 +09:00
gitmodules.txt
docs: document symlink restrictions for dot-files
2021-05-04 11:52:03 +09:00
gitnamespaces.txt
doc lint: lint and fix missing "GIT" end sections
2021-04-10 23:36:34 -07:00
gitremote-helpers.txt
…
gitrepository-layout.txt
…
gitrevisions.txt
…
gitsubmodules.txt
gitsubmodules doc: invoke 'ls-files' with '--recurse-submodules'
2020-10-04 12:54:07 -07:00
gittutorial-2.txt
…
gittutorial.txt
…
gitweb.conf.txt
gitweb: add "e-mail privacy" feature to redact e-mail addresses
2021-04-08 15:54:26 -07:00
gitweb.txt
…
gitworkflows.txt
…
glossary-content.txt
docs: improve fast-forward in glossary content
2021-05-19 21:11:49 +09:00
howto-index.sh
…
i18n.txt
i18n.txt: camel case and monospace "i18n.commitEncoding"
2021-02-24 15:21:25 -08:00
install-doc-quick.sh
…
install-webdoc.sh
…
line-range-format.txt
doc: add more pointers to gitattributes(5) for userdiff
2020-11-01 15:54:14 -08:00
line-range-options.txt
blame-options.txt: also mention 'funcname' in '-L' description
2020-11-01 15:54:14 -08:00
lint-gitlink.perl
doc lint: fix bugs in, simplify and improve lint script
2021-04-10 23:36:34 -07:00
lint-man-end-blurb.perl
doc lint: lint and fix missing "GIT" end sections
2021-04-10 23:36:34 -07:00
lint-man-section-order.perl
docs: fix linting issues due to incorrect relative section order
2021-04-10 23:36:34 -07:00
Makefile
doc: avoid using rm directly
2021-05-24 18:08:22 +09:00
manpage-base-url.xsl.in
…
manpage-bold-literal.xsl
…
manpage-normal.xsl
…
manpage-quote-apos.xsl
…
manpage.xsl
…
merge-options.txt
doc: preparatory clean-up of description on the sign-off option
2020-10-20 11:57:35 -07:00
merge-strategies.txt
…
MyFirstContribution.txt
MyFirstContribution: link #git-devel to Libera Chat
2021-06-09 09:22:54 +09:00
MyFirstObjectWalk.txt
MyFirstObjectWalk: drop init_walken_defaults()
2020-11-30 13:55:54 -08:00
object-format-disclaimer.txt
Documentation: mark --object-format=sha256 as experimental
2020-08-17 10:50:14 -07:00
pretty-formats.txt
Merge branch 'ls/typofix'
2021-05-16 21:05:24 +09:00
pretty-options.txt
doc: clarify that --abbrev=<n> is about the minimum length
2020-11-04 14:04:44 -08:00
pull-fetch-param.txt
refspec: add support for negative refspecs
2020-09-30 14:52:00 -07:00
ref-reachability-filters.txt
Doc: prefer more specific file name
2020-09-18 15:41:56 -07:00
rev-list-description.txt
…
rev-list-options.txt
rev-list: allow filtering of provided items
2021-04-19 14:09:11 -07:00
revisions.txt
revisions(7): clarify that most commands take a single revision range
2021-05-18 10:08:03 +09:00
sequencer.txt
…
signoff-option.txt
Documentation: stylistically normalize references to Signed-off-by:
2020-10-20 11:57:40 -07:00
SubmittingPatches
doc: clarify "do not capitalize the first word" rule
2021-04-14 23:41:00 -07:00
texi.xsl
…
trace2-target-values.txt
…
transfer-data-leaks.txt
…
urls-remotes.txt
…
urls.txt
…
user-manual.conf
…
user-manual.txt
user-manual.txt: assign preface an id and a title
2021-04-03 23:19:04 -07:00