git/Documentation/diff-options.txt, branch v2.18.2

doc: fix typos in documentation and release notes

2018-06-19T16:01:12Z

Signed-off-by: Karthikeyan Singaravelan Signed-off-by: Junio C Hamano

Merge branch 'rd/diff-options-typofix'

2018-06-18T17:18:41Z

Typofix. * rd/diff-options-typofix: diff-options.txt: fix minor typos, font inconsistencies, in docs

diff-options.txt: fix minor typos, font inconsistencies, in docs

2018-06-11T20:11:09Z

Signed-off-by: Robert P. J. Day Signed-off-by: Junio C Hamano

Merge branch 'en/doc-typoes'

2018-04-25T04:28:58Z

Docfix. * en/doc-typoes: Documentation: normalize spelling of 'normalised' Documentation: fix several one-character-off spelling errors

Documentation: fix several one-character-off spelling errors

2018-04-09T05:15:02Z

Signed-off-by: Elijah Newren Reviewed-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'nd/diff-stat-with-summary'

2018-03-14T19:01:02Z

"git diff" and friends learned "--compact-summary" that shows the information usually given with the "--summary" option on the same line as the diffstat output of the "--stat" option (which saves vertical space and keeps info on a single path at the same place). * nd/diff-stat-with-summary: diff: add --compact-summary diff.c: refactor pprint_rename() to use strbuf

diff: add --compact-summary

2018-02-27T23:22:47Z

Certain information is currently shown with --summary, but when used in combination with --stat it's a bit hard to read since info of the same file is in two places (--stat and --summary). On top of that, commits that add or remove files double the number of display lines, which could be a lot if you add or remove a lot of files. --compact-summary embeds most of --summary back in --stat in the little space between the file name part and the graph line, e.g. with commit 0433d533f1: Documentation/merge-config.txt | 4 + builtin/merge.c | 2 + ...-pull-verify-signatures.sh (new +x) | 81 ++++++++++++++ t/t7612-merge-verify-signatures.sh | 45 ++++++++ 4 files changed, 132 insertions(+) It helps both condensing information and saving some text space. What's new in diffstat is: - A new 0644 file is shown as (new) - A new 0755 file is shown as (new +x) - A new symlink is shown as (new +l) - A deleted file is shown as (gone) - A mode change adding executable bit is shown as (mode +x) - A mode change removing it is shown as (mode -x) Note that --compact-summary does not contain all the information --summary provides. Rewrite percentage is not shown but it could be added later, like R50% or C20%. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'sb/diff-blobfind-pickaxe'

2018-01-23T21:16:37Z

"diff" family of commands learned "--find-object=" option to limit the findings to changes that involve the named object. * sb/diff-blobfind-pickaxe: diff: use HAS_MULTI_BITS instead of counting bits manually diff: properly error out when combining multiple pickaxe options diffcore: add a pickaxe option to find a specific blob diff: introduce DIFF_PICKAXE_KINDS_MASK diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit diff.h: make pickaxe_opts an unsigned bit field

Merge branch 'jk/doc-diff-options'

2018-01-09T22:32:57Z

Doc update. * jk/doc-diff-options: docs/diff-options: clarify scope of diff-filter types

diffcore: add a pickaxe option to find a specific blob

2018-01-04T23:02:40Z

Sometimes users are given a hash of an object and they want to identify it further (ex.: Use verify-pack to find the largest blobs, but what are these? or [1]) One might be tempted to extend git-describe to also work with blobs, such that `git describe ` gives a description as ':'. This was implemented at [2]; as seen by the sheer number of responses (>110), it turns out this is tricky to get right. The hard part to get right is picking the correct 'commit-ish' as that could be the commit that (re-)introduced the blob or the blob that removed the blob; the blob could exist in different branches. Junio hinted at a different approach of solving this problem, which this patch implements. Teach the diff machinery another flag for restricting the information to what is shown. For example: $ ./git log --oneline --find-object=v2.0.0:Makefile b2feb64309 Revert the whole "ask curl-config" topic for now 47fbfded53 i18n: only extract comments marked with "TRANSLATORS:" we observe that the Makefile as shipped with 2.0 was appeared in v1.9.2-471-g47fbfded53 and in v2.0.0-rc1-5-gb2feb6430b. The reason why these commits both occur prior to v2.0.0 are evil merges that are not found using this new mechanism. [1] https://stackoverflow.com/questions/223678/which-commit-has-this-blob [2] https://public-inbox.org/git/20171028004419.10139-1-sbeller@google.com/ Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano