Junio C Hamano 00bb99c424 Merge branch 'tb/config-default' ...

"git config --get" learned the "--default" option, to help the
calling script.  Building on top of the tb/config-type topic, the
"git config" learns "--type=color" type.  Taken together, you can
do things like "git config --get foo.color --default blue" and get
the ANSI color sequence for the color given to foo.color variable,
or "blue" if the variable does not exist.

* tb/config-default:
  builtin/config: introduce `color` type specifier
  config.c: introduce 'git_config_color' to parse ANSI colors
  builtin/config: introduce `--default`

2018-05-08 15:59:27 +09:00

..

howto

t/helper: merge test-sha1 into test-tool

2018-03-27 08:45:47 -07:00

RelNotes

The fourth batch for 2.18

2018-04-25 13:44:42 +09:00

technical

Merge branch 'ds/commit-graph'

2018-05-08 15:59:20 +09:00

.gitattributes

…

.gitignore

Documentation: convert SubmittingPatches to AsciiDoc

2017-11-13 13:25:19 +09:00

asciidoc.conf

…

asciidoctor-extensions.rb

…

blame-options.txt

…

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

…

CodingGuidelines

CodingGuidelines: mention "static" and "extern"

2018-02-08 14:20:43 -08:00

config.txt

Merge branch 'ls/checkout-encoding'

2018-05-08 15:59:22 +09:00

date-formats.txt

…

diff-config.txt

…

diff-format.txt

…

diff-generate-patch.txt

…

diff-options.txt

Merge branch 'en/doc-typoes'

2018-04-25 13:28:58 +09:00

docbook-xsl.css

…

docbook.xsl

…

everyday.txto

…

fetch-options.txt

fetch: add a --prune-tags option and fetch.pruneTags config

2018-02-09 13:10:13 -08:00

fix-texi.perl

…

fmt-merge-msg-config.txt

…

git-add.txt

add: introduce "--renormalize"

2017-11-17 10:31:05 +09:00

git-am.txt

Merge branch 'nd/rebase-show-current-patch'

2018-03-06 14:54:02 -08:00

git-annotate.txt

diff: --indent-heuristic is no longer experimental

2017-11-02 14:51:24 +09:00

git-apply.txt

…

git-archimport.txt

…

git-archive.txt

…

git-bisect-lk2009.txt

…

git-bisect.txt

Merge branch 'ak/bisect-doc-typofix'

2018-04-25 13:28:56 +09:00

git-blame.txt

diff: --indent-heuristic is no longer experimental

2017-11-02 14:51:24 +09:00

git-branch.txt

Merge branch 'tz/branch-doc-remove-set-upstream'

2017-12-06 09:23:36 -08:00

git-bundle.txt

…

git-cat-file.txt

cat-file doc: document that -e will return some output

2018-01-10 15:08:14 -08:00

git-check-attr.txt

…

git-check-ignore.txt

…

git-check-mailmap.txt

…

git-check-ref-format.txt

Doc/check-ref-format: clarify information about @{-N} syntax

2017-12-19 10:00:45 -08:00

git-checkout-index.txt

…

git-checkout.txt

Merge branch 'ks/doc-checkout-previous'

2017-12-13 13:28:57 -08:00

git-cherry-pick.txt

…

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

…

git-clone.txt

Documentation/git-clone: improve description for submodule recursing

2017-12-05 11:30:38 -08:00

git-column.txt

…

git-commit-graph.txt

commit-graph: implement "--append" option

2018-04-11 10:43:02 +09:00

git-commit-tree.txt

…

git-commit.txt

commit: add support for --fixup <commit> -m"<extra message>"

2017-12-22 13:10:24 -08:00

git-config.txt

builtin/config: introduce color type specifier

2018-04-23 22:52:20 +09: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

daemon: add --log-destination=(stderr|syslog|none)

2018-02-05 10:30:44 -08:00

git-describe.txt

builtin/describe.c: describe a blob

2017-12-19 11:17:16 -08:00

git-diff-files.txt

…

git-diff-index.txt

…

git-diff-tree.txt

…

git-diff.txt

…

git-difftool.txt

…

git-fast-export.txt

…

git-fast-import.txt

…

git-fetch-pack.txt

Documentation: fix several one-character-off spelling errors

2018-04-09 14:15:02 +09:00

git-fetch.txt

fetch: make the --prune-tags work with <url>

2018-02-09 13:10:13 -08:00

git-filter-branch.txt

filter-branch: return 2 when nothing to rewrite

2018-03-15 10:41:51 -07:00

git-fmt-merge-msg.txt

…

git-for-each-ref.txt

Documentation: fix several one-character-off spelling errors

2018-04-09 14:15:02 +09:00

git-format-patch.txt

doc: convert \--option to --option

2018-04-18 12:49:26 +09:00

git-fsck-objects.txt

…

git-fsck.txt

…

git-gc.txt

Merge branch 'sg/doc-gc-quote-mismatch-fix'

2018-05-08 15:59:26 +09:00

git-get-tar-commit-id.txt

…

git-grep.txt

Merge branch 'mr/doc-negative-pathspec' into maint

2017-10-18 14:19:12 +09:00

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

index-pack: support checking objects but not links

2018-03-15 10:16:24 -07:00

git-init-db.txt

…

git-init.txt

…

git-instaweb.txt

…

git-interpret-trailers.txt

Merge branch 'bc/doc-interpret-trailers-grammofix' into maint

2018-03-22 14:24:21 -07:00

git-log.txt

git-[short]log.txt: unify quoted standalone --

2018-04-18 12:49:26 +09:00

git-ls-files.txt

…

git-ls-remote.txt

…

git-ls-tree.txt

…

git-mailinfo.txt

…

git-mailsplit.txt

…

git-merge-base.txt

merge-base --fork-point doc: clarify the example and failure modes

2017-11-09 12:28:30 +09:00

git-merge-file.txt

…

git-merge-index.txt

…

git-merge-one-file.txt

…

git-merge-tree.txt

…

git-merge.txt

Merge branch 'wk/pull-signoff'

2017-11-06 14:24:24 +09:00

git-mergetool--lib.txt

…

git-mergetool.txt

…

git-mktag.txt

…

git-mktree.txt

Documentation: normalize spelling of 'normalised'

2018-04-09 14:15:07 +09:00

git-mv.txt

…

git-name-rev.txt

…

git-notes.txt

Merge branch 'rd/doc-notes-prune-fix'

2017-12-06 09:23:40 -08:00

git-p4.txt

git-p4: update multiple shelved change lists

2017-12-22 13:30:52 -08:00

git-pack-objects.txt

gc: do not repack promisor packfiles

2017-12-08 09:52:42 -08:00

git-pack-redundant.txt

…

git-pack-refs.txt

…

git-parse-remote.txt

…

git-patch-id.txt

…

git-prune-packed.txt

…

git-prune.txt

prune: add "--progress" to man page and usage msg

2017-11-22 12:29:30 +09:00

git-pull.txt

…

git-push.txt

doc: convert \--option to --option

2018-04-18 12:49:26 +09:00

git-quiltimport.txt

…

git-read-tree.txt

Merge branch 'as/read-tree-prefix-doc-fix' into maint

2018-02-15 15:18:14 -08:00

git-rebase.txt

Merge branch 'pw/rebase-signoff'

2018-04-25 13:28:51 +09:00

git-receive-pack.txt

…

git-reflog.txt

doc: add missing "-n" (dry-run) option to reflog man page

2017-11-22 12:24:47 +09:00

git-remote-ext.txt

…

git-remote-fd.txt

…

git-remote-helpers.txto

…

git-remote-testgit.txt

…

git-remote.txt

git remote doc: correct dangerous lies about what prune does

2018-02-09 13:10:12 -08:00

git-repack.txt

…

git-replace.txt

…

git-request-pull.txt

…

git-rerere.txt

…

git-reset.txt

…

git-rev-list.txt

rev-list: add list-objects filtering support

2017-11-22 14:11:57 +09:00

git-rev-parse.txt

Merge branch 'sb/rev-parse-show-superproject-root'

2017-10-28 10:18:40 +09:00

git-revert.txt

…

git-rm.txt

…

git-send-email.txt

Merge branch 'en/doc-typoes'

2018-04-25 13:28:58 +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

git-[short]log.txt: unify quoted standalone --

2018-04-18 12:49:26 +09:00

git-show-branch.txt

…

git-show-index.txt

…

git-show-ref.txt

…

git-show.txt

doc: mention 'git show' defaults to HEAD

2018-01-30 13:12:18 -08:00

git-stage.txt

…

git-stash.txt

git-stash.txt: remove extra square bracket

2018-03-27 19:09:13 -07:00

git-status.txt

Merge branch 'en/doc-typoes'

2018-04-25 13:28:58 +09:00

git-stripspace.txt

…

git-submodule.txt

git-submodule.txt: quote usage in monospace, drop backslash

2018-04-18 12:49:26 +09:00

git-svn.txt

git-svn: allow empty email-address using authors-prog and authors-file

2018-04-05 19:22:06 +00:00

git-symbolic-ref.txt

…

git-tag.txt

tag: add --edit option

2018-02-07 12:46:48 -08:00

git-tools.txt

…

git-unpack-file.txt

…

git-unpack-objects.txt

…

git-update-index.txt

Merge branch 'bp/fsmonitor' into maint

2018-03-22 14:24:21 -07:00

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 'sb/worktree-remove-opt-force'

2018-05-08 15:59:24 +09:00

git-write-tree.txt

…

git.txt

Merge branch 'ab/man-sec-list'

2018-03-15 15:00:46 -07:00

gitattributes.txt

Merge branch 'ls/checkout-encoding'

2018-05-08 15:59:22 +09:00

gitcli.txt

…

gitcore-tutorial.txt

…

gitcredentials.txt

…

gitcvs-migration.txt

…

gitdiffcore.txt

…

giteveryday.txt

…

gitglossary.txt

…

githooks.txt

Merge branch 'es/worktree-checkout-hook'

2017-12-27 11:16:21 -08:00

gitignore.txt

gitignore.txt: elaborate shell glob syntax

2018-02-02 10:56:46 -08:00

gitk.txt

doc: convert [\--] to [--]

2018-04-18 12:49:26 +09:00

gitmodules.txt

…

gitnamespaces.txt

…

gitremote-helpers.txt

Merge branch 'bw/protocol-v2'

2018-05-08 15:59:16 +09:00

gitrepository-layout.txt

worktree: delete dead code

2018-03-15 12:37:47 -07:00

gitrevisions.txt

…

gitsubmodules.txt

Merge branch 'ms/non-ascii-ticks' into maint

2018-03-22 14:24:26 -07:00

gittutorial-2.txt

…

gittutorial.txt

treewide: correct several "up-to-date" to "up to date"

2017-08-23 12:17:22 -07:00

gitweb.conf.txt

…

gitweb.txt

…

gitworkflows.txt

Merge branch 'db/doc-workflows-neuter-the-maintainer'

2017-12-27 11:16:25 -08:00

glossary-content.txt

glossary: substitute "ancestor" for "direct ancestor" in 'push' description.

2018-04-17 11:23:23 +09:00

howto-index.sh

…

i18n.txt

…

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

…

lint-gitlink.perl

…

mailmap.txt

…

Makefile

Merge branch 'bw/protocol-v2'

2018-05-08 15:59:16 +09:00

manpage-1.72.xsl

…

manpage-base-url.xsl.in

…

manpage-base.xsl

…

manpage-bold-literal.xsl

…

manpage-normal.xsl

…

manpage-quote-apos.xsl

…

manpage-suppress-sp.xsl

…

merge-config.txt

merge: add config option for verifySignatures

2017-12-12 10:51:38 -08:00

merge-options.txt

merge: allow fast-forward when merging a tracked tag

2018-02-16 11:22:43 -08:00

merge-strategies.txt

Merge branch 'dp/merge-strategy-doc-fix'

2018-03-21 11:30:13 -07:00

pretty-formats.txt

Merge branch 'mk/doc-pretty-fill'

2018-03-08 12:36:29 -08:00

pretty-options.txt

…

pull-fetch-param.txt

…

rebase-config.txt

rebase -i: learn to abbreviate command names

2017-12-05 10:20:51 -08:00

rev-list-options.txt

Merge branch 'jh/fsck-promisors'

2018-02-13 13:39:03 -08:00

revisions.txt

Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").

2017-12-04 08:25:06 -08:00

sequencer.txt

…

SubmittingPatches

SubmittingPatches: mention the git contacts command

2018-04-12 11:34:34 +09:00

texi.xsl

…

transfer-data-leaks.txt

…

urls-remotes.txt

…

urls.txt

…

user-manual.conf

…

user-manual.txt

checkout: describe_detached_head: remove ellipsis after committish

2017-12-06 07:32:40 -08:00