git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-30 17:56:17 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity
Files
e58142add40e0db354eaed9554d1b0c871e23f7d
git/Documentation
History
Sergey Organov e58142add4 doc/rev-list-options: document --first-parent changes merges format 
After introduction of the --diff-merges=first-parent, the
--first-parent sets the default format for merges to the same value as
this new option. Document this behavior and add corresponding
reference to --diff-merges.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-12-21 13:47:32 -08:00
..
config
Merge branch 'dl/checkout-guess'
2020-10-27 15:09:51 -07:00
howto
Merge branch 'js/pu-to-seen'
2020-07-06 22:09:16 -07:00
RelNotes
Second batch
2020-10-30 13:04:24 -07:00
technical
Merge branch 'tb/bloom-improvements'
2020-09-29 14:01:20 -07:00
.gitattributes
…
.gitignore
Merge branch 'js/misc-doc-fixes'
2019-05-09 00:37:27 +09:00
asciidoc.conf
Doc: drop support for docbook-xsl before 1.72.0
2020-03-29 09:25:38 -07:00
asciidoctor-extensions.rb
Merge branch 'ma/user-manual-markup-update'
2019-10-06 12:25:16 +09:00
blame-options.txt
blame-options.txt: document --first-parent option
2020-08-06 14:08:10 -07:00
build-docdep.perl
…
cat-texi.perl
…
cmd-list.perl
git.txt: add list of guides
2020-08-04 18:34:02 -07:00
CodingGuidelines
Merge branch 'dl/python-2.7-is-the-floor-version'
2020-06-17 21:54:05 -07:00
config.txt
Merge branch 'sb/clone-origin'
2020-10-27 15:09:50 -07:00
date-formats.txt
date-formats.txt: fix list continuation
2020-05-18 13:18:56 -07:00
diff-format.txt
doc: indent multi-line items in list
2019-12-13 12:18:07 -08:00
diff-generate-patch.txt
doc/diff-generate-patch: mention new --diff-merges option
2020-12-21 13:47:32 -08:00
diff-options.txt
Merge branch 'dd/diff-customize-index-line-abbrev'
2020-08-31 15:49:46 -07:00
doc-diff
doc-diff: use single-colon rule in rendering Makefile
2020-02-18 13:53:30 -08:00
docbook-xsl.css
…
docbook.xsl
…
everyday.txto
…
fetch-options.txt
Merge branch 'ds/maintenance-part-1'
2020-09-25 15:25:38 -07:00
fix-texi.perl
…
git-add.txt
add: support the --pathspec-from-file option
2019-12-04 10:10:37 -08:00
git-am.txt
Documentation: document am --no-gpg-sign
2020-04-03 11:37:22 -07:00
git-annotate.txt
…
git-apply.txt
git-apply.txt: update descriptions of --cached, --index
2020-08-20 16:34:37 -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
blame: add the ability to ignore commits and their changes
2019-05-16 11:36:23 +09:00
git-branch.txt
Doc: prefer more specific file name
2020-09-18 15:41:56 -07:00
git-bugreport.txt
Merge branch 'es/bugreport-shell'
2020-06-08 18:06:28 -07:00
git-bundle.txt
bundle: add new version for use with SHA-256
2020-07-30 09:16:48 -07:00
git-cat-file.txt
cat-file: add missing [=<format>] to usage/synopsis
2020-07-01 15:54:05 -07:00
git-check-attr.txt
Documentation: fix a bunch of typos, both old and new
2019-11-07 13:42:00 +09:00
git-check-ignore.txt
Merge branch 'en/check-ignore' into maint
2020-03-17 15:02:23 -07:00
git-check-mailmap.txt
…
git-check-ref-format.txt
doc: promote "git switch"
2019-04-02 13:57:00 +09:00
git-checkout-index.txt
…
git-checkout.txt
Merge branch 'dl/checkout-guess'
2020-10-27 15:09:51 -07:00
git-cherry-pick.txt
cherry-pick/revert: honour --no-gpg-sign in all case
2020-04-03 11:37:22 -07:00
git-cherry.txt
…
git-citool.txt
…
git-clean.txt
Merge branch 'en/clean-nested-with-ignored'
2019-10-11 14:24:46 +09:00
git-clone.txt
Merge branch 'sb/clone-origin'
2020-10-27 15:09:50 -07:00
git-column.txt
…
git-commit-graph.txt
commit-graph: introduce 'commitGraph.maxNewFilters'
2020-09-18 10:39:22 -07:00
git-commit-tree.txt
Documentation: merge commit-tree --[no-]gpg-sign
2020-04-03 11:37:22 -07:00
git-commit.txt
Documentation: reword commit --no-gpg-sign
2020-04-03 11:37:22 -07:00
git-config.txt
config: add '--show-scope' to print the scope of a config value
2020-02-10 10:49:12 -08:00
git-count-objects.txt
…
git-credential-cache--daemon.txt
…
git-credential-cache.txt
…
git-credential-store.txt
Merge branch 'cb/credential-store-ignore-bogus-lines'
2020-05-08 14:25:01 -07:00
git-credential.txt
git-credential.txt: use list continuation
2020-05-18 13:19:33 -07:00
git-cvsexportcommit.txt
…
git-cvsimport.txt
…
git-cvsserver.txt
Documentation: fix a bunch of typos, both old and new
2019-11-07 13:42:00 +09:00
git-daemon.txt
doc: format pathnames and URLs as monospace.
2019-03-13 11:14:22 +09:00
git-describe.txt
describe doc: remove '7-char' abbreviation reference
2019-04-08 17:24:51 +09:00
git-diff-files.txt
…
git-diff-index.txt
…
git-diff-tree.txt
Documentation/git-diff-tree.txt: fix formatting
2019-04-01 15:17:47 +09:00
git-diff.txt
git-diff.txt: reorder possible usages
2020-07-13 12:47:38 -07:00
git-difftool.txt
difftool: fallback on merge.guitool
2019-05-13 23:11:59 +09:00
git-fast-export.txt
fast-export: allow seeding the anonymized mapping
2020-06-25 14:19:23 -07:00
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
Doc: prefer more specific file name
2020-09-18 15:41:56 -07:00
git-format-patch.txt
format-patch: teach --no-encode-email-headers
2020-04-07 22:37:18 -07:00
git-fsck-objects.txt
…
git-fsck.txt
Documentation/git-fsck.txt: include fsck.* config variables
2019-07-29 10:41:18 -07:00
git-gc.txt
Recommend git-filter-repo instead of git-filter-branch
2019-09-05 13:01:48 -07:00
git-get-tar-commit-id.txt
…
git-grep.txt
doc: use linkgit macro where needed.
2020-10-08 14:01:18 -07:00
git-gui.txt
Documentation: update the location of the git-gui repo
2019-10-06 09:45:02 +09:00
git-hash-object.txt
hash-object doc: stop mentioning git-cvsimport
2019-05-28 10:47:42 -07:00
git-help.txt
help: drop usage of 'common' and 'useful' for guides
2020-08-04 18:34:01 -07:00
git-http-backend.txt
Documentation: turn middle-of-line tabs into spaces
2019-03-07 09:25:32 +09:00
git-http-fetch.txt
http-fetch: support fetching packfiles by URL
2020-06-10 18:06:34 -07: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
Documentation: mark --object-format=sha256 as experimental
2020-08-17 10:50:14 -07:00
git-init-db.txt
…
git-init.txt
doc: fix the bnf like style of some commands
2020-10-08 14:01:19 -07:00
git-instaweb.txt
git-instaweb: add Python builtin http.server support
2019-01-28 10:57:44 -08:00
git-interpret-trailers.txt
interpret-trailers.txt: start the desc line with a capital letter
2019-04-01 15:49:47 +09:00
git-log.txt
doc/git-log: describe new --diff-merges options
2020-12-21 13:47:32 -08:00
git-ls-files.txt
doc: --recurse-submodules mostly applies to active submodules
2020-04-06 13:42:43 -07:00
git-ls-remote.txt
docs: adjust for the recent rename of pu to seen
2020-06-25 09:18:53 -07:00
git-ls-tree.txt
doc: format pathnames and URLs as monospace.
2019-03-13 11:14:22 +09:00
git-mailinfo.txt
Doc: show example scissors line
2020-09-28 16:09:04 -07:00
git-mailsplit.txt
…
git-maintenance.txt
maintenance: add incremental-repack task
2020-09-25 10:53:04 -07:00
git-merge-base.txt
git-merge-base.txt: render indentations correctly under Asciidoctor
2019-09-09 11:05:51 -07:00
git-merge-file.txt
…
git-merge-index.txt
git-merge-index.txt: wrap shell listing in "----"
2019-09-09 11:05:52 -07:00
git-merge-one-file.txt
…
git-merge-tree.txt
…
git-merge.txt
Doc: reference the "stash list" in autostash docs
2020-05-05 16:07:30 -07:00
git-mergetool--lib.txt
mergetool: use get_merge_tool function
2019-05-13 23:11:59 +09:00
git-mergetool.txt
mergetool: fallback to tool when guitool unavailable
2019-05-13 23:11:59 +09:00
git-mktag.txt
…
git-mktree.txt
…
git-multi-pack-index.txt
multi-pack-index: repack batches below --batch-size
2020-08-11 14:05:26 -07:00
git-mv.txt
…
git-name-rev.txt
…
git-notes.txt
docs: improve the example that illustrates git-notes path names
2020-08-03 12:40:09 -07:00
git-p4.txt
git-p4: add p4 submit hooks
2020-02-14 08:58:53 -08:00
git-pack-objects.txt
pack-objects: no fetch when allow-{any,promisor}
2020-08-06 13:01:03 -07:00
git-pack-redundant.txt
…
git-pack-refs.txt
…
git-parse-remote.txt
…
git-patch-id.txt
…
git-prune-packed.txt
…
git-prune.txt
…
git-pull.txt
Merge branch 'dl/merge-autostash'
2020-04-29 16:15:27 -07:00
git-push.txt
t, doc: update tests, reference for "--force-if-includes"
2020-10-03 09:59:19 -07:00
git-quiltimport.txt
…
git-range-diff.txt
Merge branch 'dl/range-diff-with-notes'
2019-12-05 12:52:44 -08:00
git-read-tree.txt
doc: --recurse-submodules mostly applies to active submodules
2020-04-06 13:42:43 -07:00
git-rebase.txt
Merge branch 'pb/doc-sequence-editor-configuration'
2020-09-03 12:37:06 -07:00
git-receive-pack.txt
git-receive-pack.txt: wrap shell [script] listing in "----"
2019-09-09 11:05:52 -07:00
git-reflog.txt
…
git-remote-ext.txt
Merge branch 'js/check-docs-exe'
2019-04-22 11:14:46 +09:00
git-remote-fd.txt
docs: move gitremote-helpers into section 7
2019-04-01 14:00:53 +09:00
git-remote-helpers.txto
docs: move gitremote-helpers into section 7
2019-04-01 14:00:53 +09:00
git-remote.txt
doc: git-remote fix ups
2020-10-08 14:01:18 -07:00
git-repack.txt
doc: fix repeated words
2019-08-11 17:40:07 -07:00
git-replace.txt
Recommend git-filter-repo instead of git-filter-branch
2019-09-05 13:01:48 -07:00
git-request-pull.txt
…
git-rerere.txt
Merge branch 'nd/switch-and-restore'
2019-07-09 15:25:44 -07:00
git-reset.txt
doc: document --recurse-submodules for reset and restore
2020-04-06 13:42:43 -07:00
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
git-log.txt: include rev-list-description.txt
2020-07-08 22:08:54 -07:00
git-rev-parse.txt
rev-parse: make --show-toplevel without a worktree an error
2019-11-20 10:19:58 +09:00
git-revert.txt
cherry-pick/revert: honour --no-gpg-sign in all case
2020-04-03 11:37:22 -07:00
git-rm.txt
rm: support the --pathspec-from-file option
2020-02-19 10:56:49 -08:00
git-send-email.txt
Documentation: wrap config listings in "----"
2019-09-09 11:05:51 -07:00
git-send-pack.txt
…
git-sh-i18n--envsubst.txt
…
git-sh-i18n.txt
…
git-sh-setup.txt
…
git-shell.txt
…
git-shortlog.txt
shortlog: allow multiple groups to be specified
2020-09-27 12:21:05 -07:00
git-show-branch.txt
Documentation/git-show-branch: avoid literal {apostrophe}
2019-04-10 12:05:03 +09:00
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
…
git-sparse-checkout.txt
Merge branch 'en/sparse-with-submodule-doc'
2020-06-22 15:55:03 -07:00
git-stage.txt
…
git-stash.txt
stash push: support the --pathspec-from-file option
2020-02-19 10:56:49 -08:00
git-status.txt
Documentation: wrap blocks with "--"
2019-09-09 11:05:51 -07:00
git-stripspace.txt
…
git-submodule.txt
submodule: fall back to remote's HEAD for missing remote.<name>.branch
2020-06-24 09:14:21 -07:00
git-svn.txt
git svn: stop using rebase --preserve-merges
2019-11-23 09:49:23 +09: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
Doc: prefer more specific file name
2020-09-18 15:41:56 -07:00
git-tools.txt
…
git-unpack-file.txt
…
git-unpack-objects.txt
…
git-update-index.txt
doc: dissuade users from trying to ignore tracked files
2020-01-22 12:27:49 -08:00
git-update-ref.txt
Modify pseudo refs through ref backend storage
2020-07-27 10:06:49 -07:00
git-update-server-info.txt
update-server-info: avoid needless overwrites
2019-05-15 14:07:37 +09:00
git-upload-archive.txt
…
git-upload-pack.txt
doc: tidy asciidoc style
2019-01-23 11:37:29 -08:00
git-var.txt
…
git-verify-commit.txt
…
git-verify-pack.txt
…
git-verify-tag.txt
…
git-web--browse.txt
doc: format pathnames and URLs as monospace.
2019-03-13 11:14:22 +09:00
git-whatchanged.txt
…
git-worktree.txt
worktree: teach list to annotate locked worktree
2020-10-12 12:24:29 -07:00
git-write-tree.txt
…
git.txt
refs: add GIT_TRACE_REFS debugging mechanism
2020-09-09 12:58:37 -07:00
gitattributes.txt
userdiff: support Markdown
2020-05-02 18:04:12 -07:00
gitcli.txt
Merge branch 'jc/doc-single-h-is-for-help' into maint
2020-03-17 15:02:24 -07:00
gitcore-tutorial.txt
doc/gitcore-tutorial: fix prose to match example command
2020-01-08 08:56:40 -08:00
gitcredentials.txt
command-list.txt: add missing 'gitcredentials' and 'gitremote-helpers'
2020-08-04 18:34:01 -07:00
gitcvs-migration.txt
…
gitdiffcore.txt
…
giteveryday.txt
docs: adjust for the recent rename of pu to seen
2020-06-25 09:18:53 -07:00
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
Merge branch 'jx/proc-receive-hook'
2020-09-25 15:25:39 -07:00
gitignore.txt
Merge branch 'an/ignore-doc-update' into maint
2019-07-25 14:27:13 -07:00
gitk.txt
doc: log, gitk: line-log arguments must exist in starting revision
2019-12-26 11:00:15 -08:00
gitmodules.txt
submodule: fall back to remote's HEAD for missing remote.<name>.branch
2020-06-24 09:14:21 -07:00
gitnamespaces.txt
…
gitremote-helpers.txt
Merge branch 'bc/sha-256-part-2'
2020-07-06 22:09:13 -07:00
gitrepository-layout.txt
Merge branch 'sg/dir-trie-fixes'
2019-11-10 18:02:14 +09:00
gitrevisions.txt
…
gitsubmodules.txt
gitsubmodules doc: invoke 'ls-files' with '--recurse-submodules'
2020-10-04 12:54:07 -07:00
gittutorial-2.txt
doc: promote "git restore"
2019-05-07 13:04:48 +09:00
gittutorial.txt
doc: promote "git restore"
2019-05-07 13:04:48 +09:00
gitweb.conf.txt
gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
2019-09-09 11:05:52 -07:00
gitweb.txt
doc: don't use git.kernel.org as example gitweb URL
2019-06-24 12:37:21 -07:00
gitworkflows.txt
gitworkflows.txt: fix broken subsection underline
2020-07-18 13:43:34 -07:00
glossary-content.txt
doc: typo: s/can not/cannot/ and s/is does/does/
2019-08-05 10:05:24 -07:00
howto-index.sh
…
i18n.txt
…
install-doc-quick.sh
…
install-webdoc.sh
…
line-range-format.txt
…
lint-gitlink.perl
…
mailmap.txt
…
Makefile
git.txt: add list of guides
2020-08-04 18:34:02 -07:00
manpage-base-url.xsl.in
…
manpage-bold-literal.xsl
manpage-bold-literal.xsl: stop using git.docbook.backslash
2020-03-29 09:25:38 -07:00
manpage-normal.xsl
manpage-normal.xsl: fold in manpage-base.xsl
2020-03-29 09:25:38 -07:00
manpage-quote-apos.xsl
…
manpage.xsl
Documentation: fix build with Asciidoctor 2
2019-09-16 12:20:39 -07:00
merge-options.txt
Merge branch 'dl/merge-autostash'
2020-04-29 16:15:27 -07:00
merge-strategies.txt
merge-strategies: fix typo "reflected to" to "reflected in"
2019-11-11 11:04:46 +09:00
MyFirstContribution.txt
config: drop git_config_get_string_const()
2020-08-17 15:35:47 -07:00
MyFirstObjectWalk.txt
MyFirstObjectWalk: remove unnecessary conditional statement
2020-03-30 11:16:41 -07: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 'mk/pb-pretty-email-without-domain-part-fix'
2020-07-06 22:09:15 -07:00
pretty-options.txt
pretty-options.txt: fix --no-abbrev-commit description
2020-08-27 08:37:09 -07: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
git-log.txt: include rev-list-description.txt
2020-07-08 22:08:54 -07:00
rev-list-options.txt
doc/rev-list-options: document --first-parent changes merges format
2020-12-21 13:47:32 -08:00
revisions.txt
revisions.txt: describe 'rev1 rev2 ...' meaning for ranges
2020-07-08 22:08:53 -07:00
sequencer.txt
cherry-pick/revert: add --skip option
2019-07-02 12:08:08 -07:00
SubmittingPatches
Merge branch 'js/pu-to-seen'
2020-07-06 22:09:16 -07:00
texi.xsl
…
trace2-target-values.txt
docs: mention trace2 target-dir mode in git-config
2019-10-04 09:26:42 +09:00
transfer-data-leaks.txt
…
urls-remotes.txt
…
urls.txt
Doc: Bundle file usage
2019-10-21 12:02:39 +09:00
user-manual.conf
user-manual.conf: don't specify [listingblock]
2020-03-31 16:08:02 -07:00
user-manual.txt
docs: adjust for the recent rename of pu to seen
2020-06-25 09:18:53 -07:00