Michael Haggerty 5b162879e9 blame: honor the diff heuristic options and config ...

Teach "git blame" and "git annotate" the --compaction-heuristic and
--indent-heuristic options that are now supported by "git diff".

Also teach them to honor the `diff.compactionHeuristic` and
`diff.indentHeuristic` configuration options.

It would be conceivable to introduce separate configuration options for
"blame" and "annotate"; for example `blame.compactionHeuristic` and
`blame.indentHeuristic`. But it would be confusing to users if blame
output is inconsistent with diff output, so it makes more sense for them
to respect the same configuration.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2016-09-19 10:25:11 -07:00

..

howto

command-list.txt: add the common groups block

2015-05-21 13:03:37 -07:00

RelNotes

Second batch of topics for 2.10

2016-06-27 10:07:08 -07:00

technical

Merge branch 'jc/linkgit-fix' into maint

2016-05-26 13:17:26 -07:00

.gitattributes

…

.gitignore

…

asciidoc.conf

…

blame-options.txt

Merge branch 'ea/blame-progress'

2016-01-12 15:16:54 -08:00

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

command-list: prepare machinery for upcoming "common groups" section

2015-05-21 13:03:37 -07:00

CodingGuidelines

doc: clearer rule about formatting literals

2016-06-08 12:04:37 -07:00

config.txt

Merge branch 'tr/doc-tt'

2016-06-27 09:56:42 -07:00

date-formats.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

diff-config.txt

diff: improve positioning of add/delete blocks in diffs

2016-09-19 10:25:11 -07:00

diff-format.txt

diff-format doc: a score can follow M for rewrite

2015-01-28 22:22:03 -08:00

diff-generate-patch.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

diff-heuristic-options.txt

blame: honor the diff heuristic options and config

2016-09-19 10:25:11 -07:00

diff-options.txt

blame: honor the diff heuristic options and config

2016-09-19 10:25:11 -07:00

docbook-xsl.css

…

docbook.xsl

…

everyday.txto

Documentation: fix linkgit references

2016-05-09 15:44:14 -07:00

fetch-options.txt

Merge branch 'jk/fetch-prune-doc'

2016-06-27 09:56:44 -07:00

fix-texi.perl

…

fmt-merge-msg-config.txt

Documentation: include 'merge.branchdesc' for merge and config as well

2015-05-28 12:38:46 -07:00

git-add.txt

git-add doc: do not say working directory when you mean working tree

2016-01-21 09:06:35 -08:00

git-am.txt

Expand documentation describing --signoff

2016-01-05 13:42:39 -08:00

git-annotate.txt

blame: honor the diff heuristic options and config

2016-09-19 10:25:11 -07:00

git-apply.txt

git-apply.txt: mention the behavior inside a subdir

2016-03-24 10:16:52 -07:00

git-archimport.txt

…

git-archive.txt

…

git-bisect-lk2009.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-bisect.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-blame.txt

blame: honor the diff heuristic options and config

2016-09-19 10:25:11 -07:00

git-branch.txt

Merge branch 'kn/for-each-branch'

2015-10-15 15:43:38 -07:00

git-bundle.txt

transport: drop support for git-over-rsync

2016-02-01 13:07:41 -08:00

git-cat-file.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-check-attr.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-check-ignore.txt

Documentation: fix linkgit references

2016-05-09 15:44:14 -07:00

git-check-mailmap.txt

…

git-check-ref-format.txt

Merge branch 'nd/doc-check-ref-format-typo' into maint

2015-12-11 11:14:15 -08:00

git-checkout-index.txt

…

git-checkout.txt

checkout: add --progress option

2015-11-01 14:08:17 -08:00

git-cherry-pick.txt

Merge branch 'pa/cherry-pick-doc-typo'

2016-06-03 14:38:02 -07:00

git-cherry.txt

…

git-citool.txt

…

git-clean.txt

Documentation/git-clean.txt: don't mention deletion of .git/modules/*

2016-02-09 10:07:34 -08:00

git-clone.txt

Merge branch 'sb/clone-shallow-passthru'

2016-05-06 14:45:43 -07:00

git-column.txt

…

git-commit-tree.txt

Merge branch 'jc/commit-tree-ignore-commit-gpgsign'

2016-05-13 13:18:27 -07:00

git-commit.txt

Merge branch 'tr/doc-tt'

2016-06-27 09:56:42 -07:00

git-config.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-count-objects.txt

…

git-credential-cache--daemon.txt

credential-cache: close stderr in daemon process

2014-09-16 11:11:58 -07:00

git-credential-cache.txt

credential-cache--daemon: disallow relative socket path

2016-02-23 12:56:27 -08:00

git-credential-store.txt

git-credential-store: support XDG_CONFIG_HOME

2015-03-24 08:08:02 -07:00

git-credential.txt

…

git-cvsexportcommit.txt

…

git-cvsimport.txt

Documentation: typofixes

2014-11-04 13:14:44 -08:00

git-cvsserver.txt

*config.txt: stick to camelCase naming convention

2015-03-13 22:13:46 -07:00

git-daemon.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-describe.txt

Merge branch 'sg/describe-contains'

2015-08-31 15:39:10 -07:00

git-diff-files.txt

…

git-diff-index.txt

…

git-diff-tree.txt

…

git-diff.txt

…

git-difftool.txt

difftool: add support for --trust-exit-code

2014-10-28 10:36:57 -07:00

git-fast-export.txt

doc: convert \--option to --option

2015-05-12 22:14:46 -07:00

git-fast-import.txt

fast-import: implement unpack limit

2016-05-11 14:56:00 -07:00

git-fetch-pack.txt

fetch-pack: update the documentation for "<refs>..." arguments

2016-03-05 10:54:35 -08:00

git-fetch.txt

Merge branch 'jc/em-dash-in-doc' into maint

2015-11-04 14:20:45 -08:00

git-filter-branch.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-fmt-merge-msg.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-for-each-ref.txt

Documentation: fix linkgit references

2016-05-09 15:44:14 -07:00

git-format-patch.txt

Merge branch 'tr/doc-tt'

2016-06-27 09:56:42 -07:00

git-fsck-objects.txt

…

git-fsck.txt

fsck: introduce git fsck --connectivity-only

2015-06-23 14:27:37 -07:00

git-gc.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

git-get-tar-commit-id.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-grep.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

git-gui.txt

…

git-hash-object.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-help.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

git-http-backend.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-http-fetch.txt

…

git-http-push.txt

…

git-imap-send.txt

imap-send: use cURL automatically when NO_OPENSSL defined

2015-03-10 15:19:05 -07:00

git-index-pack.txt

…

git-init-db.txt

…

git-init.txt

Merge branch 'tr/doc-tt'

2016-06-27 09:56:42 -07:00

git-instaweb.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

git-interpret-trailers.txt

interpret-trailers: add option for in-place editing

2016-01-14 12:22:17 -08:00

git-log.txt

Merge branch 'tr/doc-tt'

2016-06-27 09:56:42 -07:00

git-ls-files.txt

documentation: fix some typos

2016-03-03 13:43:36 -08:00

git-ls-remote.txt

ls-remote: add support for showing symrefs

2016-01-19 10:07:56 -08:00

git-ls-tree.txt

…

git-mailinfo.txt

Merge branch 'va/mailinfo-doc-typofix' into maint

2016-05-26 13:17:14 -07:00

git-mailsplit.txt

…

git-merge-base.txt

…

git-merge-file.txt

merge-file: clamp exit code to maximum 127

2015-10-29 12:10:23 -07:00

git-merge-index.txt

…

git-merge-one-file.txt

…

git-merge-tree.txt

…

git-merge.txt

pull: pass --allow-unrelated-histories to "git merge"

2016-04-21 11:58:51 -07:00

git-mergetool--lib.txt

…

git-mergetool.txt

…

git-mktag.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-mktree.txt

…

git-mv.txt

…

git-name-rev.txt

…

git-notes.txt

doc: change environment variables format

2016-06-08 12:04:37 -07:00

git-p4.txt

Merge branch 'tr/doc-tt'

2016-06-27 09:56:42 -07:00

git-pack-objects.txt

pack-objects: warn on split packs disabling bitmaps

2016-04-28 09:58:14 -07:00

git-pack-redundant.txt

…

git-pack-refs.txt

…

git-parse-remote.txt

…

git-patch-id.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-prune-packed.txt

Documentation: adjust document title underlining

2014-10-13 13:35:18 -07:00

git-prune.txt

worktree: new place for "git prune --worktrees"

2015-06-29 08:48:44 -07:00

git-pull.txt

pull --rebase: add --[no-]autostash flag

2016-03-21 13:30:36 -07:00

git-push.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

git-quiltimport.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-read-tree.txt

…

git-rebase.txt

rebase: decouple --exec from --interactive

2016-03-18 14:35:31 -07:00

git-receive-pack.txt

*config.txt: stick to camelCase naming convention

2015-03-13 22:13:46 -07:00

git-reflog.txt

git-reflog: add exists command

2015-07-21 14:08:14 -07:00

git-relink.txt

…

git-remote-ext.txt

doc: add some crossrefs between manual pages

2014-11-11 14:47:04 -08:00

git-remote-fd.txt

doc: add some crossrefs between manual pages

2014-11-11 14:47:04 -08:00

git-remote-helpers.txto

…

git-remote-testgit.txt

…

git-remote.txt

Merge branch 'xf/user-manual-markup' into maint

2015-11-04 14:20:47 -08:00

git-repack.txt

pack-objects: warn on split packs disabling bitmaps

2016-04-28 09:58:14 -07:00

git-replace.txt

doc: change environment variables format

2016-06-08 12:04:37 -07:00

git-request-pull.txt

doc: show usage of branch description

2015-09-14 12:50:33 -07:00

git-rerere.txt

*config.txt: stick to camelCase naming convention

2015-03-13 22:13:46 -07:00

git-reset.txt

…

git-rev-list.txt

Merge branch 'jk/date-local'

2015-10-05 12:30:13 -07:00

git-rev-parse.txt

rev-parse --parseopt: allow [*=?!] in argument hints

2015-07-15 10:30:54 -07:00

git-revert.txt

Expand documentation describing --signoff

2016-01-05 13:42:39 -08:00

git-rm.txt

…

git-send-email.txt

Merge branch 'tr/doc-tt'

2016-06-27 09:56:42 -07:00

git-send-pack.txt

push: support signing pushes iff the server supports it

2015-08-19 12:58:45 -07:00

git-sh-i18n--envsubst.txt

…

git-sh-i18n.txt

…

git-sh-setup.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

git-shell.txt

…

git-shortlog.txt

…

git-show-branch.txt

…

git-show-index.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-show-ref.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-show.txt

doc: convert \--option to --option

2015-05-12 22:14:46 -07:00

git-stage.txt

Documentation: adjust document title underlining

2014-10-13 13:35:18 -07:00

git-stash.txt

stash: allow "stash show" diff output configurable

2015-08-31 11:29:04 -07:00

git-status.txt

Documentation: explain optional arguments better

2015-09-21 10:48:23 -07:00

git-stripspace.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-submodule.txt

submodule update: learn --[no-]recommend-shallow option

2016-05-27 10:40:46 -07:00

git-svn.txt

Merge branch 'ap/git-svn-propset-doc'

2016-06-27 09:56:43 -07:00

git-symbolic-ref.txt

…

git-tag.txt

Merge branch 'dn/gpg-doc'

2016-06-27 09:56:45 -07:00

git-tools.txt

Documentation/git-tools: retire manually-maintained list

2015-07-28 13:21:59 -07:00

git-unpack-file.txt

…

git-unpack-objects.txt

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

git-update-index.txt

config: add core.untrackedCache

2016-01-27 12:30:00 -08:00

git-update-ref.txt

update-ref and tag: add --create-reflog arg

2015-07-21 14:08:35 -07:00

git-update-server-info.txt

…

git-upload-archive.txt

Documentation: match underline with the text

2015-10-22 10:16:12 -07:00

git-upload-pack.txt

upload-pack.c: use parse-options API

2016-05-31 10:17:20 -07:00

git-var.txt

…

git-verify-commit.txt

Merge branch 'dn/gpg-doc'

2016-06-27 09:56:45 -07:00

git-verify-pack.txt

git-verify-pack.txt: fix inconsistent spelling of "packfile"

2015-05-17 11:24:57 -07:00

git-verify-tag.txt

verify-tag: add option to print raw gpg status information

2015-06-22 14:20:47 -07:00

git-web--browse.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

git-whatchanged.txt

…

git-worktree.txt

worktree: allow "-" short-hand for @{-1} in add command

2016-05-31 12:28:25 -07:00

git-write-tree.txt

…

git.txt

Merge branch 'ep/http-curl-trace'

2016-07-06 13:38:06 -07:00

gitattributes.txt

userdiff: add built-in pattern for CSS

2016-06-03 14:45:56 -07:00

gitcli.txt

…

gitcore-tutorial.txt

transport: drop support for git-over-rsync

2016-02-01 13:07:41 -08:00

gitcredentials.txt

credential: let empty credential specs reset helper list

2016-02-26 10:58:14 -08:00

gitcvs-migration.txt

doc: add 'everyday' to 'git help'

2014-10-10 16:02:26 -07:00

gitdiffcore.txt

doc: convert \--option to --option

2015-05-12 22:14:46 -07:00

giteveryday.txt

Documentation/everyday: match undefline with the text

2015-10-22 10:14:44 -07:00

gitglossary.txt

doc: add 'everyday' to 'git help'

2014-10-10 16:02:26 -07:00

githooks.txt

hooks: allow customizing where the hook directory is

2016-05-04 16:25:13 -07:00

gitignore.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

gitk.txt

Documentation: change -L:<regex> to -L:<funcname>

2015-04-20 11:05:50 -07:00

gitmodules.txt

submodule: improve documentation of update subcommand

2015-03-02 14:59:55 -08:00

gitnamespaces.txt

…

gitremote-helpers.txt

doc: change configuration variables format

2016-06-08 12:04:55 -07:00

gitrepository-layout.txt

Documentation/git-worktree: wordsmith worktree-related manpages

2015-07-20 11:07:18 -07:00

gitrevisions.txt

Documentation: match underline with the text

2015-10-22 10:16:12 -07:00

gittutorial-2.txt

Merge branch 'sn/tutorial-status-output-example'

2014-11-19 13:47:59 -08:00

gittutorial.txt

transport: drop support for git-over-rsync

2016-02-01 13:07:41 -08:00

gitweb.conf.txt

doc: more consistency in environment variables format

2016-06-08 12:04:37 -07:00

gitweb.txt

doc: change environment variables format

2016-06-08 12:04:37 -07:00

gitworkflows.txt

…

glossary-content.txt

Merge branch 'rn/glossary-typofix' into HEAD

2016-05-18 14:40:14 -07:00

howto-index.sh

…

i18n.txt

Documentation/i18n.txt: clarify character encoding support

2015-07-01 14:55:53 -07:00

install-doc-quick.sh

…

install-webdoc.sh

…

line-range-format.txt

Documentation: change -L:<regex> to -L:<funcname>

2015-04-20 11:05:50 -07:00

lint-gitlink.perl

ci: validate "linkgit:" in documentation

2016-05-10 11:15:04 -07:00

mailmap.txt

…

Makefile

Documentation: bold literals in man

2016-05-31 11:42:30 -07: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

doc: change environment variables format

2016-06-08 12:04:37 -07:00

merge-options.txt

Merge branch 'kf/gpg-sig-verification-doc'

2016-05-17 14:38:39 -07:00

merge-strategies.txt

merge-strategies.txt: fix typo

2016-02-22 10:42:52 -08:00

pretty-formats.txt

Documentation: clarify signature verification

2016-05-13 12:37:44 -07:00

pretty-options.txt

Merge branch 'tr/doc-tt'

2016-06-27 09:56:42 -07:00

pull-fetch-param.txt

docs: Explain the purpose of fetch's and pull's <refspec> parameter.

2014-06-12 09:59:13 -07:00

rev-list-options.txt

Merge branch 'jk/date-local'

2015-10-05 12:30:13 -07:00

revisions.txt

Merge branch 'wp/sha1-name-negative-match'

2016-02-10 14:20:10 -08:00

sequencer.txt

…

SubmittingPatches

Documentation: add setup instructions for Travis CI

2016-05-02 11:31:44 -07:00

urls-remotes.txt

Documentation: match underline with the text

2015-10-22 10:16:12 -07:00

urls.txt

transport: drop support for git-over-rsync

2016-02-01 13:07:41 -08:00

user-manual.conf

…

user-manual.txt

documentation: fix some typos

2016-03-03 13:43:36 -08:00