git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-02-25 01:52:28 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity
git/Documentation
History
Junio C Hamano 77357e806f Merge branch 'en/merge-strategy-docs' into maint 
Documentation updates.

* en/merge-strategy-docs:
  Update error message and code comment
  merge-strategies.txt: add coverage of the `ort` merge strategy
  git-rebase.txt: correct out-of-date and misleading text about renames
  merge-strategies.txt: fix simple capitalization error
  merge-strategies.txt: avoid giving special preference to patience algorithm
  merge-strategies.txt: do not imply using copy detection is desired
  merge-strategies.txt: update wording for the resolve strategy
  Documentation: edit awkward references to `git merge-recursive`
  directory-rename-detection.txt: small updates due to merge-ort optimizations
  git-rebase.txt: correct antiquated claims about --rebase-merges
2021-10-12 13:51:22 -07:00
..
config
Merge branch 'pb/submodule-recurse-doc'
2021-08-02 14:06:39 -07:00
howto
…
RelNotes
Git 2.33
2021-08-16 12:15:44 -07:00
technical
directory-rename-detection.txt: small updates due to merge-ort optimizations
2021-08-05 08:57:39 -07:00
.gitattributes
…
.gitignore
…
asciidoc.conf
…
asciidoctor-extensions.rb
…
blame-options.txt
…
build-docdep.perl
…
cat-texi.perl
…
cmd-list.perl
…
CodingGuidelines
Merge branch 'ds/gender-neutral-doc-guidelines'
2021-07-28 13:18:02 -07:00
config.txt
…
date-formats.txt
…
diff-format.txt
…
diff-generate-patch.txt
…
diff-options.txt
Merge branch 'jn/log-m-does-not-imply-p'
2021-08-11 12:36:18 -07:00
doc-diff
…
docbook-xsl.css
…
docbook.xsl
…
everyday.txto
…
fetch-options.txt
…
fix-texi.perl
…
git-add.txt
…
git-am.txt
…
git-annotate.txt
…
git-apply.txt
…
git-archimport.txt
…
git-archive.txt
…
git-bisect-lk2009.txt
…
git-bisect.txt
…
git-blame.txt
…
git-branch.txt
…
git-bugreport.txt
…
git-bundle.txt
bundle doc: replace "basis" with "prerequsite(s)"
2021-08-02 14:46:22 -07:00
git-cat-file.txt
…
git-check-attr.txt
…
git-check-ignore.txt
…
git-check-mailmap.txt
…
git-check-ref-format.txt
…
git-checkout-index.txt
…
git-checkout.txt
…
git-cherry-pick.txt
…
git-cherry.txt
…
git-citool.txt
…
git-clean.txt
…
git-clone.txt
…
git-column.txt
…
git-commit-graph.txt
…
git-commit-tree.txt
…
git-commit.txt
…
git-config.txt
doc/git-config: simplify "override" advice for FILES section
2021-07-20 14:55:06 -07:00
git-count-objects.txt
…
git-credential-cache--daemon.txt
…
git-credential-cache.txt
…
git-credential-store.txt
…
git-credential.txt
…
git-cvsexportcommit.txt
…
git-cvsimport.txt
…
git-cvsserver.txt
…
git-daemon.txt
…
git-describe.txt
…
git-diff-files.txt
…
git-diff-index.txt
…
git-diff-tree.txt
…
git-diff.txt
git-diff: fix missing --merge-base docs
2021-07-12 13:55:29 -07:00
git-difftool.txt
…
git-fast-export.txt
…
git-fast-import.txt
…
git-fetch-pack.txt
…
git-fetch.txt
Documentation: render special characters correctly
2021-07-30 09:08:12 -07:00
git-filter-branch.txt
…
git-fmt-merge-msg.txt
…
git-for-each-ref.txt
…
git-for-each-repo.txt
…
git-format-patch.txt
…
git-fsck-objects.txt
…
git-fsck.txt
…
git-gc.txt
…
git-get-tar-commit-id.txt
…
git-grep.txt
…
git-gui.txt
…
git-hash-object.txt
…
git-help.txt
…
git-http-backend.txt
…
git-http-fetch.txt
…
git-http-push.txt
…
git-imap-send.txt
…
git-index-pack.txt
…
git-init-db.txt
…
git-init.txt
…
git-instaweb.txt
…
git-interpret-trailers.txt
…
git-log.txt
…
git-ls-files.txt
…
git-ls-remote.txt
…
git-ls-tree.txt
…
git-mailinfo.txt
…
git-mailsplit.txt
…
git-maintenance.txt
…
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
…
git-mergetool.txt
…
git-mktag.txt
…
git-mktree.txt
…
git-multi-pack-index.txt
…
git-mv.txt
…
git-name-rev.txt
…
git-notes.txt
…
git-p4.txt
…
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
doc: pull: fix rebase=false documentation
2021-07-21 16:34:06 -07:00
git-push.txt
Merge branch 'ds/gender-neutral-doc'
2021-07-16 17:42:53 -07:00
git-quiltimport.txt
…
git-range-diff.txt
…
git-read-tree.txt
…
git-rebase.txt
git-rebase.txt: correct out-of-date and misleading text about renames
2021-08-05 08:57:40 -07:00
git-receive-pack.txt
…
git-reflog.txt
…
git-remote-ext.txt
…
git-remote-fd.txt
…
git-remote-helpers.txto
…
git-remote.txt
…
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
…
git-rev-list.txt
…
git-rev-parse.txt
…
git-revert.txt
…
git-rm.txt
…
git-send-email.txt
…
git-send-pack.txt
…
git-sh-i18n--envsubst.txt
…
git-sh-i18n.txt
…
git-sh-setup.txt
…
git-shell.txt
…
git-shortlog.txt
…
git-show-branch.txt
…
git-show-index.txt
…
git-show-ref.txt
…
git-show.txt
…
git-sparse-checkout.txt
…
git-stage.txt
…
git-stash.txt
…
git-status.txt
…
git-stripspace.txt
…
git-submodule.txt
…
git-svn.txt
…
git-switch.txt
…
git-symbolic-ref.txt
…
git-tag.txt
…
git-tools.txt
…
git-unpack-file.txt
…
git-unpack-objects.txt
…
git-update-index.txt
…
git-update-ref.txt
…
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
Merge branch 'sm/worktree-add-lock'
2021-07-28 13:17:58 -07:00
git-write-tree.txt
…
git.txt
…
gitattributes.txt
…
gitcli.txt
…
gitcore-tutorial.txt
…
gitcredentials.txt
…
gitcvs-migration.txt
…
gitdiffcore.txt
…
giteveryday.txt
…
gitfaq.txt
…
gitglossary.txt
…
githooks.txt
…
gitignore.txt
…
gitk.txt
…
gitmailmap.txt
…
gitmodules.txt
…
gitnamespaces.txt
…
gitremote-helpers.txt
…
gitrepository-layout.txt
…
gitrevisions.txt
…
gitsubmodules.txt
…
gittutorial-2.txt
…
gittutorial.txt
Documentation: render special characters correctly
2021-07-30 09:08:12 -07:00
gitweb.conf.txt
…
gitweb.txt
…
gitworkflows.txt
…
glossary-content.txt
…
howto-index.sh
…
i18n.txt
…
install-doc-quick.sh
…
install-webdoc.sh
…
line-range-format.txt
…
line-range-options.txt
…
lint-gitlink.perl
…
lint-man-end-blurb.perl
…
lint-man-section-order.perl
…
Makefile
…
manpage-base-url.xsl.in
…
manpage-bold-literal.xsl
…
manpage-normal.xsl
…
manpage-quote-apos.xsl
…
manpage.xsl
…
merge-options.txt
Merge branch 'en/merge-strategy-docs' into maint
2021-10-12 13:51:22 -07:00
merge-strategies.txt
merge-strategies.txt: add coverage of the ort merge strategy
2021-08-05 08:57:40 -07:00
MyFirstContribution.txt
…
MyFirstObjectWalk.txt
…
object-format-disclaimer.txt
…
pretty-formats.txt
…
pretty-options.txt
…
pull-fetch-param.txt
…
ref-reachability-filters.txt
…
rev-list-description.txt
…
rev-list-options.txt
Merge branch 'bc/rev-list-without-commit-line'
2021-07-22 13:05:56 -07:00
revisions.txt
…
sequencer.txt
…
signoff-option.txt
…
SubmittingPatches
SubmittingPatches: replace discussion of Travis with GitHub Actions
2021-07-22 12:53:14 -07:00
texi.xsl
…
trace2-target-values.txt
…
transfer-data-leaks.txt
…
urls-remotes.txt
…
urls.txt
…
user-manual.conf
…
user-manual.txt
Merge branch 'ds/gender-neutral-doc'
2021-07-16 17:42:53 -07:00