Junio C Hamano 7203bafa88 Merge branch 'ah/diff-files-ours-theirs-doc' ...

The diff options "--ours", "--theirs" exist for quite some time.
But so far they were not documented. Now they are.

* ah/diff-files-ours-theirs-doc:
  diff-files: document --ours etc.

2017-04-19 21:37:16 -07:00

..

howto

Merge branch 'po/fix-doc-merge-base-illustration' into maint

2016-10-28 09:01:21 -07:00

RelNotes

Twelfth batch for 2.13

2017-04-16 23:30:49 -07:00

technical

Merge branch 'bc/object-id'

2017-04-19 21:37:13 -07:00

.gitattributes

…

.gitignore

…

asciidoc.conf

…

asciidoctor-extensions.rb

Documentation: implement linkgit macro for Asciidoctor

2017-01-31 12:18:18 -08:00

blame-options.txt

Merge branch 'bc/blame-doc-fix'

2017-02-24 10:48:08 -08: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

…

CodingGuidelines

CodingGuidelines: clarify multi-line brace style

2017-01-17 14:32:47 -08:00

config.txt

Merge branch 'bw/submodule-is-active'

2017-03-30 14:07:14 -07:00

date-formats.txt

Merge branch 'lr/doc-fix-cet' into maint

2017-01-17 15:19:08 -08:00

diff-config.txt

Merge branch 'rh/diff-orderfile-doc'

2017-01-23 15:59:23 -08:00

diff-format.txt

Documentation: improve description for core.quotePath

2017-03-02 11:40:51 -08:00

diff-generate-patch.txt

Documentation: improve description for core.quotePath

2017-03-02 11:40:51 -08:00

diff-heuristic-options.txt

diff: retire "compaction" heuristics

2016-12-23 12:32:22 -08:00

diff-options.txt

Documentation: improve description for core.quotePath

2017-03-02 11:40:51 -08:00

docbook-xsl.css

…

docbook.xsl

…

everyday.txto

…

fetch-options.txt

…

fix-texi.perl

…

fmt-merge-msg-config.txt

…

git-add.txt

…

git-am.txt

…

git-annotate.txt

…

git-apply.txt

Documentation: improve description for core.quotePath

2017-03-02 11:40:51 -08:00

git-archimport.txt

…

git-archive.txt

…

git-bisect-lk2009.txt

…

git-bisect.txt

git-bisect.txt: add missing word

2017-04-01 11:35:45 -07:00

git-blame.txt

…

git-branch.txt

Merge branch 'ab/ref-filter-no-contains'

2017-04-11 00:21:50 -07:00

git-bundle.txt

…

git-cat-file.txt

…

git-check-attr.txt

…

git-check-ignore.txt

…

git-check-mailmap.txt

…

git-check-ref-format.txt

git-check-ref-format: clarify documentation for --normalize

2017-02-21 13:02:42 -08:00

git-checkout-index.txt

…

git-checkout.txt

builtin/checkout: add --recurse-submodules switch

2017-03-16 14:07:16 -07:00

git-cherry-pick.txt

…

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

…

git-clone.txt

clone: teach --recurse-submodules to optionally take a pathspec

2017-03-18 09:51:23 -07:00

git-column.txt

…

git-commit-tree.txt

…

git-commit.txt

Merge branch 'nd/commit-hook-doc-fix'

2017-03-21 15:07:20 -07:00

git-config.txt

…

git-count-objects.txt

…

git-credential-cache--daemon.txt

…

git-credential-cache.txt

credential-cache: use XDG_CACHE_HOME for socket

2017-03-17 11:19:40 -07:00

git-credential-store.txt

…

git-credential.txt

…

git-cvsexportcommit.txt

…

git-cvsimport.txt

…

git-cvsserver.txt

…

git-daemon.txt

…

git-describe.txt

builtin/describe: introduce --broken flag

2017-03-22 10:13:41 -07:00

git-diff-files.txt

…

git-diff-index.txt

…

git-diff-tree.txt

…

git-diff.txt

diff-files: document --ours etc.

2017-04-13 16:15:25 -07:00

git-difftool.txt

Document the --no-gui option in difftool

2017-02-08 13:30:28 -08:00

git-fast-export.txt

…

git-fast-import.txt

…

git-fetch-pack.txt

upload-pack: optionally allow fetching any sha1

2016-11-18 13:06:14 -08:00

git-fetch.txt

Merge branch 'mm/push-social-engineering-attack-doc' into maint

2017-01-17 15:19:10 -08:00

git-filter-branch.txt

filter-branch: fix --prune-empty on parentless commits

2017-03-03 12:43:37 -08:00

git-fmt-merge-msg.txt

…

git-for-each-ref.txt

ref-filter: add --no-contains option to tag/branch/for-each-ref

2017-03-24 12:15:26 -07:00

git-format-patch.txt

doc: change erroneous --[no]-whatever into --[no-]whatever

2017-03-20 10:04:57 -07:00

git-fsck-objects.txt

…

git-fsck.txt

…

git-gc.txt

docs/git-gc: fix default value for --aggressiveDepth

2017-02-24 09:59:12 -08:00

git-get-tar-commit-id.txt

…

git-grep.txt

grep: enable recurse-submodules to work on <tree> objects

2016-12-22 11:47:33 -08:00

git-gui.txt

doc: git-gui browser does not default to HEAD

2017-01-13 12:23:28 -08:00

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

init: document dotfiles exclusion on template copy

2017-02-17 15:57:21 -08:00

git-instaweb.txt

…

git-interpret-trailers.txt

doc: mention user-configured trailers

2016-11-21 12:49:57 -08:00

git-log.txt

…

git-ls-files.txt

Merge branch 'mm/ls-files-s-doc'

2017-04-16 23:29:30 -07:00

git-ls-remote.txt

…

git-ls-tree.txt

Documentation: improve description for core.quotePath

2017-03-02 11:40:51 -08:00

git-mailinfo.txt

…

git-mailsplit.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

Merge branch 'jc/merge-drop-old-syntax'

2017-03-30 14:07:13 -07:00

git-mergetool--lib.txt

…

git-mergetool.txt

…

git-mktag.txt

…

git-mktree.txt

…

git-mv.txt

…

git-name-rev.txt

name-rev: add support to exclude refs by pattern match

2017-01-23 18:33:17 -08:00

git-notes.txt

…

git-p4.txt

Merge branch 'ls/p4-retry-thrice'

2017-01-18 15:12:12 -08:00

git-pack-objects.txt

…

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 'mm/push-social-engineering-attack-doc' into maint

2017-01-17 15:19:10 -08:00

git-push.txt

Merge branch 'bw/push-submodule-only'

2017-02-10 12:52:23 -08:00

git-quiltimport.txt

…

git-read-tree.txt

builtin/read-tree: add --recurse-submodules switch

2017-03-16 14:07:16 -07:00

git-rebase.txt

Merge branch 'nd/rebase-forget'

2016-12-19 14:45:35 -08:00

git-receive-pack.txt

…

git-reflog.txt

…

git-remote-ext.txt

…

git-remote-fd.txt

…

git-remote-helpers.txto

…

git-remote-testgit.txt

…

git-remote.txt

…

git-repack.txt

…

git-replace.txt

…

git-request-pull.txt

…

git-rerere.txt

…

git-reset.txt

reset: add an example of how to split a commit into two

2017-02-16 13:38:02 -08:00

git-rev-list.txt

…

git-rev-parse.txt

rev-parse: add --show-superproject-working-tree

2017-03-08 15:52:03 -08:00

git-revert.txt

…

git-rm.txt

…

git-send-email.txt

doc: change erroneous --[no]-whatever into --[no-]whatever

2017-03-20 10:04:57 -07:00

git-send-pack.txt

remote-curl: allow push options

2017-03-22 15:41:21 -07:00

git-sh-i18n--envsubst.txt

…

git-sh-i18n.txt

…

git-sh-setup.txt

…

git-shell.txt

…

git-shortlog.txt

shortlog: test and document --committer option

2016-12-16 09:39:10 -08:00

git-show-branch.txt

…

git-show-index.txt

…

git-show-ref.txt

…

git-show.txt

…

git-stage.txt

…

git-stash.txt

stash: allow pathspecs in the no verb form

2017-02-28 14:21:10 -08:00

git-status.txt

submodule.c: correctly handle nested submodules in is_submodule_modified

2017-03-29 17:37:21 -07:00

git-stripspace.txt

…

git-submodule.txt

submodule init: initialize active submodules

2017-03-18 09:51:23 -07:00

git-svn.txt

git-svn: document useLogAuthor and addAuthorFrom config keys

2016-12-12 10:49:50 -08:00

git-symbolic-ref.txt

…

git-tag.txt

ref-filter: reflow recently changed branch/tag/for-each-ref docs

2017-03-24 12:15:26 -07:00

git-tools.txt

…

git-unpack-file.txt

…

git-unpack-objects.txt

…

git-update-index.txt

Documentation/git-update-index: explain splitIndex.*

2017-03-06 12:09:28 -08: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

builtin/verify-tag: add --format to verify-tag

2017-01-17 16:10:22 -08:00

git-web--browse.txt

…

git-whatchanged.txt

…

git-worktree.txt

Merge branch 'bc/worktree-doc-fix-detached'

2017-02-24 10:48:10 -08:00

git-write-tree.txt

…

git.txt

Sync with 2.12.2

2017-03-24 13:31:01 -07:00

gitattributes.txt

Documentation: fix a typo

2017-02-01 13:46:52 -08:00

gitcli.txt

…

gitcore-tutorial.txt

Merge branch 'sb/doc-unify-bottom'

2017-02-15 12:54:20 -08:00

gitcredentials.txt

…

gitcvs-migration.txt

Merge branch 'sb/doc-unify-bottom'

2017-02-15 12:54:20 -08:00

gitdiffcore.txt

docs/diffcore: unquote "Complete Rewrites" in headers

2017-02-28 11:34:38 -08:00

giteveryday.txt

giteveryday: unbreak rendering with AsciiDoctor

2017-01-07 14:03:40 -08:00

gitglossary.txt

Documentation: unify bottom "part of git suite" lines

2017-02-09 15:14:01 -08:00

githooks.txt

…

gitignore.txt

…

gitk.txt

Merge branch 'sb/remove-gitview'

2017-01-18 15:12:18 -08:00

gitmodules.txt

Merge branch 'bw/submodule-branch-dot-doc' into maint

2016-10-28 09:01:19 -07:00

gitnamespaces.txt

doc: mention transfer data leaks in more places

2016-11-14 11:23:07 -08:00

gitremote-helpers.txt

Merge branch 'jk/doc-remote-helpers-markup-fix'

2017-02-15 14:56:40 -08:00

gitrepository-layout.txt

Merge branch 'sb/doc-unify-bottom'

2017-02-15 12:54:20 -08:00

gitrevisions.txt

…

gittutorial-2.txt

Documentation: unify bottom "part of git suite" lines

2017-02-09 15:14:01 -08:00

gittutorial.txt

Documentation: unify bottom "part of git suite" lines

2017-02-09 15:14:01 -08:00

gitweb.conf.txt

…

gitweb.txt

…

gitworkflows.txt

Documentation: unify bottom "part of git suite" lines

2017-02-09 15:14:01 -08:00

glossary-content.txt

pathspec: allow querying for attributes

2017-03-13 15:28:54 -07:00

howto-index.sh

…

i18n.txt

…

install-doc-quick.sh

…

install-webdoc.sh

…

line-range-format.txt

…

lint-gitlink.perl

…

mailmap.txt

…

Makefile

Merge branch 'bc/use-asciidoctor-opt'

2017-02-02 13:36:57 -08: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-options.txt

…

merge-strategies.txt

…

pretty-formats.txt

pretty: add %(trailers) format for displaying trailers of a commit message

2016-12-11 13:58:41 -08:00

pretty-options.txt

…

pull-fetch-param.txt

…

rev-list-options.txt

rev-list-options.txt: update --all about HEAD

2017-02-08 13:37:32 -08:00

revisions.txt

rev-parse: match @{upstream}, @{u} and @{push} case-insensitively

2017-03-27 10:45:44 -07:00

sequencer.txt

…

SubmittingPatches

doc/SubmittingPatches: show how to get a CLI commit summary

2017-03-26 15:59:08 -07:00

texi.xsl

Documentation: add XSLT to fix DocBook for Texinfo

2017-01-23 10:56:53 -08: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

…

user-manual.conf

…

user-manual.txt

asciidoctor: fix user-manual to be built by asciidoctor

2017-01-13 10:30:16 -08:00