admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
cfd86ee3dd754bb160703f37a987f409c4ddd972
git/Documentation
History
Junio C Hamano 7baf6588c5 Merge branch 'jc/doc-format-patch-clarify-auto-base' 
Rephrase the description of "format-patch --base=auto".

* jc/doc-format-patch-clarify-auto-base:
  format-patch (doc): clarify --base=auto
2021-11-01 13:48:08 -07:00
..
config
Merge branch 'hm/paint-hits-in-log-grep'
2021-11-01 13:48:08 -07:00
howto
Document how we do embargoed releases
2021-03-27 15:13:12 -07:00
RelNotes
Git 2.34-rc0
2021-10-29 15:43:50 -07:00
technical
Merge branch 'jc/doc-commit-header-continuation-line'
2021-10-25 16:07:00 -07:00
.gitattributes
…
.gitignore
doc lint: make "lint-docs" non-.PHONY
2021-10-15 10:29:11 -07: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
Merge branch 'bs/doc-blame-color-lines'
2021-10-18 15:47:58 -07:00
build-docdep.perl
…
cat-texi.perl
Documentation: remove unneeded argument in cat-texi.perl
2017-01-23 10:56:47 -08:00
cmd-list.perl
git.txt: add list of guides
2020-08-04 18:34:02 -07:00
CodingGuidelines
Merge branch 'ds/gender-neutral-doc-guidelines'
2021-07-28 13:18:02 -07:00
config.txt
config.txt: fix typo
2021-10-25 09:12:56 -07:00
date-formats.txt
doc: mention approxidates for git-commit --date
2021-02-23 13:33:02 -08:00
diff-format.txt
Documentation/diff-format: state in which cases porcelain status is T
2021-10-04 13:07:18 -07:00
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 'jn/log-m-does-not-imply-p'
2021-08-11 12:36:18 -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
fetch: document the --negotiate-only option
2021-06-30 14:57:22 -07:00
fix-texi.perl
…
git-add.txt
add: implement the --sparse option
2021-09-28 10:31:02 -07:00
git-am.txt
git-am.txt: clarify --abort behavior
2021-09-10 15:51:14 -07:00
git-annotate.txt
Use proper syntax for replaceables in command docs
2018-05-25 17:16:47 +09:00
git-apply.txt
git-apply: allow simultaneous --cached and --3way options
2021-04-07 22:20:33 -07:00
git-archimport.txt
git-archimport.1: specify what kind of Arch we're talking about
2018-09-21 09:28:58 -07:00
git-archive.txt
archive: describe compression level option
2021-10-25 10:08:23 -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
Merge branch 'bs/doc-blame-color-lines'
2021-10-18 15:47:58 -07:00
git-branch.txt
branch (doc): -m/-c copies config and reflog
2021-10-23 17:12:41 -07:00
git-bugreport.txt
Documentation: fix default directory of git bugreport -o
2021-09-07 14:25:13 -07:00
git-bundle.txt
git-bundle.txt: add missing words and punctuation
2021-10-27 17:06:12 -07:00
git-cat-file.txt
cat-file: disable refs/replace with --batch-all-objects
2021-10-08 15:45:14 -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
check-mailmap doc: note config options
2021-01-12 14:04:40 -08:00
git-check-ref-format.txt
doc: promote "git switch"
2019-04-02 13:57:00 +09:00
git-checkout-index.txt
…
git-checkout.txt
Documentation: call out commands that nuke untracked files/directories
2021-09-27 13:38:37 -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
Merge branch 'en/clean-nested-with-ignored'
2019-10-11 14:24:46 +09:00
git-clone.txt
builtin/clone.c: add --reject-shallow option
2021-04-01 12:58:58 -07:00
git-column.txt
column: fix parsing of the '--nl' option
2021-08-26 14:36:27 -07:00
git-commit-graph.txt
Merge branch 'ds/commit-graph-merging-fix'
2020-11-02 13:17:39 -08:00
git-commit-tree.txt
Documentation: merge commit-tree --[no-]gpg-sign
2020-04-03 11:37:22 -07:00
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
doc: config, tell readers of git help --config
2021-09-13 14:51:07 -07:00
git-count-objects.txt
count-objects: report alternates via verbose mode
2016-10-10 13:52:37 -07:00
git-credential-cache--daemon.txt
…
git-credential-cache.txt
Use proper syntax for replaceables in command docs
2018-05-25 17:16:47 +09:00
git-credential-store.txt
Merge branch 'cb/credential-store-ignore-bogus-lines'
2020-05-08 14:25:01 -07:00
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
Merge branch 'jk/doc-cvs-update' into maint
2016-10-03 13:22:25 -07:00
git-cvsserver.txt
Documentation: cleanup git-cvsserver
2021-09-16 20:47:48 -07:00
git-daemon.txt
doc: format pathnames and URLs as monospace.
2019-03-13 11:14:22 +09:00
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
git-diff: fix missing --merge-base docs
2021-07-12 13:55:29 -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
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
Documentation: fix several one-character-off spelling errors
2018-04-09 14:15:02 +09:00
git-fetch.txt
Documentation: render special characters correctly
2021-07-30 09:08:12 -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
config.txt: move fmt-merge-msg-config.txt to config/
2018-10-29 10:17:01 +09:00
git-for-each-ref.txt
ref-filter: --format=%(raw) support --perl
2021-07-26 12:01:25 -07: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
format-patch (doc): clarify --base=auto
2021-10-23 14:33:20 -07: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
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: correct logic error in combining --all and --config
2021-09-23 10:30:43 -07:00
git-http-backend.txt
docs/http-backend: mention v2 protocol
2021-09-10 15:34:59 -07:00
git-http-fetch.txt
http-fetch: allow custom index-pack args
2021-02-22 12:07:40 -08:00
git-http-push.txt
doc: keep first level section header in upper case
2018-05-02 17:03:33 +09:00
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
index-pack: add --progress-title option
2021-09-07 10:59:23 -07: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-instaweb: add Python builtin http.server support
2019-01-28 10:57:44 -08:00
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
docs: adjust for the recent rename of pu to seen
2020-06-25 09:18:53 -07:00
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: add support for systemd timers on Linux
2021-09-07 10:57: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
pull: update docs & code for option compatibility with rebasing
2021-07-22 11:54:30 -07:00
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
Documentation: normalize spelling of 'normalised'
2018-04-09 14:15:07 +09:00
git-multi-pack-index.txt
git-multi-pack-index.txt: change "folder" to "directory"
2021-10-25 11:06:56 -07:00
git-mv.txt
…
git-name-rev.txt
doc: keep first level section header in upper case
2018-05-02 17:03:33 +09:00
git-notes.txt
docs: improve the example that illustrates git-notes path names
2020-08-03 12:40:09 -07:00
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
doc: remove unsupported parameter from patch-id
2017-07-28 14:41:32 -07:00
git-prune-packed.txt
…
git-prune.txt
doc: keep first level section header in upper case
2018-05-02 17:03:33 +09:00
git-pull.txt
Merge branch 'js/retire-preserve-merges'
2021-10-18 15:47:56 -07:00
git-push.txt
Merge branch 'ds/gender-neutral-doc'
2021-07-16 17:42:53 -07:00
git-quiltimport.txt
git-quiltimport: add --keep-non-patch option
2019-01-07 15:29:34 -08:00
git-range-diff.txt
Merge branch 'js/range-diff-one-side-only'
2021-02-17 17:21:41 -08:00
git-read-tree.txt
Documentation: call out commands that nuke untracked files/directories
2021-09-27 13:38:37 -07:00
git-rebase.txt
Merge branch 'js/retire-preserve-merges'
2021-10-18 15:47:56 -07:00
git-receive-pack.txt
upload-pack: document and rename --advertise-refs
2021-08-05 08:59:37 -07:00
git-reflog.txt
reflog expire: cover reflog from all worktrees
2018-10-22 13:32:54 +09:00
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
remote: add meaningful exit code on missing/existing
2020-10-27 11:40:33 -07:00
git-repack.txt
builtin/repack.c: make largest pack preferred
2021-09-28 21:20:56 -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
doc: keep first level section header in upper case
2018-05-02 17:03:33 +09:00
git-rerere.txt
Merge branch 'nd/switch-and-restore'
2019-07-09 15:25:44 -07:00
git-reset.txt
Documentation: call out commands that nuke untracked files/directories
2021-09-27 13:38:37 -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
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: add --sparse option
2021-09-28 10:31:02 -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
send-pack: properly use parse_options() API for usage string
2021-09-12 18:57:30 -07:00
git-sh-i18n--envsubst.txt
…
git-sh-i18n.txt
…
git-sh-setup.txt
…
git-shell.txt
doc: keep first level section header in upper case
2018-05-02 17:03:33 +09:00
git-shortlog.txt
mailmap: only look for .mailmap in work tree
2021-02-10 13:34:51 -08: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-ref.txt: fix order of flags
2019-01-10 10:29:05 -08:00
git-show.txt
doc/git-show: include --diff-merges description
2020-12-21 13:47:32 -08:00
git-sparse-checkout.txt
sparse-checkout: clear tracked sparse dirs
2021-09-07 22:41:10 -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
Merge branch 'ja/doc-status-types-and-copies'
2021-10-13 15:15:58 -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: drop support for --preserve-merges
2021-09-07 21:45:33 -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
doc: replace or.cz gitwiki link with git.wiki.kernel.org
2017-04-20 22:05:37 -07:00
git-unpack-file.txt
…
git-unpack-objects.txt
unpack-objects: add --max-input-size=<size> option
2016-08-24 12:31:05 -07:00
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
update-server-info: avoid needless overwrites
2019-05-15 14:07:37 +09:00
git-upload-archive.txt
…
git-upload-pack.txt
Merge branch 'jk/http-server-protocol-versions'
2021-09-23 13:44:47 -07:00
git-var.txt
doc: keep first level section header in upper case
2018-05-02 17:03:33 +09:00
git-verify-commit.txt
…
git-verify-pack.txt
…
git-verify-tag.txt
builtin/verify-tag: add --format to verify-tag
2017-01-17 16:10:22 -08:00
git-version.txt
documentation: add documentation for 'git version'
2021-09-14 10:05:40 -07:00
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
Merge branch 'sm/worktree-add-lock'
2021-07-28 13:17:58 -07:00
git-write-tree.txt
…
git.txt
Merge branch 'ma/doc-git-version'
2021-10-29 15:43:14 -07:00
gitattributes.txt
docs: document symlink restrictions for dot-files
2021-05-04 11:52:03 +09: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
Merge branch 'sb/doc-unify-bottom'
2017-02-15 12:54:20 -08:00
gitdiffcore.txt
Merge branch 'en/ort-perf-batch-8'
2021-03-22 14:00:24 -07:00
giteveryday.txt
docs: adjust for the recent rename of pu to seen
2020-06-25 09:18:53 -07:00
gitfaq.txt
Update docs for change of default merge backend
2021-08-05 15:35:02 -07:00
gitglossary.txt
Documentation: unify bottom "part of git suite" lines
2017-02-09 15:14:01 -08:00
githooks.txt
githooks.txt: clarify documentation on reference-transaction hook
2021-03-01 09:02:01 -08:00
gitignore.txt
gitignore.txt: change "folder" to "directory"
2021-10-25 11:06:56 -07: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
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
push doc: correct lies about how push refspecs work
2018-08-31 14:04:06 -07:00
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
Documentation: render special characters correctly
2021-07-30 09:08:12 -07:00
gitweb.conf.txt
gitweb: add "e-mail privacy" feature to redact e-mail addresses
2021-04-08 15:54:26 -07:00
gitweb.txt
gitweb.txt: change "folder" to "directory"
2021-10-25 11:06:57 -07:00
gitworkflows.txt
gitworkflows.txt: fix broken subsection underline
2020-07-18 13:43:34 -07:00
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-doc-quick: allow specifying what ref to install
2017-12-12 16:49:40 -08:00
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: make "lint-docs" non-.PHONY
2021-10-15 10:29:11 -07:00
lint-man-end-blurb.perl
doc lint: emit errors on STDERR
2021-10-15 10:16:57 -07:00
lint-man-section-order.perl
doc lint: emit errors on STDERR
2021-10-15 10:16:57 -07:00
Makefile
Merge branch 'ab/fix-make-lint-docs'
2021-10-29 15:43:13 -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 'en/pull-conflicting-options' into maint
2021-10-12 13:51:36 -07:00
merge-strategies.txt
Update docs for change of default merge backend
2021-08-05 15:35:02 -07:00
MyFirstContribution.txt
MyFirstContribution: Document --range-diff option when writing v2
2021-09-22 14:25:05 -07:00
MyFirstObjectWalk.txt
Merge branch 'es/walken-tutorial-fix' into maint
2021-10-12 13:51:29 -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 'ls/typofix'
2021-05-16 21:05:24 +09:00
pretty-options.txt
log: document --encoding behavior on iconv() failure
2021-10-29 14:35:59 -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
connected: do not sort input revisions
2021-08-09 09:51:12 -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
cherry-pick/revert: add --skip option
2019-07-02 12:08:08 -07:00
signoff-option.txt
Documentation: stylistically normalize references to Signed-off-by:
2020-10-20 11:57:40 -07:00
SubmittingPatches
SubmittingPatches: replace discussion of Travis with GitHub Actions
2021-07-22 12:53:14 -07:00
texi.xsl
Documentation: add XSLT to fix DocBook for Texinfo
2017-01-23 10:56:53 -08:00
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
doc: mention transfer data leaks in more places
2016-11-14 11:23:07 -08:00
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
Update docs for change of default merge backend
2021-08-05 15:35:02 -07:00