git/Documentation/gitattributes.txt, branch v2.23.2

Merge branch 'nd/switch-and-restore'

2019-07-09T22:25:44Z

Two new commands "git switch" and "git restore" are introduced to split "checking out a branch to work on advancing its history" and "checking out paths out of the index and/or a tree-ish to work on advancing the current history" out of the single "git checkout" command. * nd/switch-and-restore: (46 commits) completion: disable dwim on "git switch -d" switch: allow to switch in the middle of bisect t2027: use test_must_be_empty Declare both git-switch and git-restore experimental help: move git-diff and git-reset to different groups doc: promote "git restore" user-manual.txt: prefer 'merge --abort' over 'reset --hard' completion: support restore t: add tests for restore restore: support --patch restore: replace --force with --ignore-unmerged restore: default to --source=HEAD when only --staged is specified restore: reject invalid combinations with --staged restore: add --worktree and --staged checkout: factor out worktree checkout code restore: disable overlay mode by default restore: make pathspec mandatory restore: take tree-ish from --source option instead checkout: split part of it to new command 'restore' doc: promote "git switch" ...

Merge branch 'ml/userdiff-rust'

2019-06-21T18:24:08Z

The pattern "git diff/grep" use to extract funcname and words boundary for Rust has been added. * ml/userdiff-rust: userdiff: two simplifications of patterns for rust userdiff: add built-in pattern for rust

userdiff: fix grammar and style issues

2019-05-29T16:50:31Z

Signed-off-by: Boxuan Li Signed-off-by: Junio C Hamano

userdiff: add Octave

2019-05-19T01:45:28Z

Octave pattern is almost the same as matlab, except that '%%%' and '##' can also be used to begin code sections, in addition to '%%' that is understood by both. Octave pattern is merged into Matlab pattern. Test cases for the hunk header patterns of matlab and octave under t/t4018 are added. Signed-off-by: Boxuan Li Signed-off-by: Junio C Hamano

userdiff: add built-in pattern for rust

2019-05-17T03:54:02Z

This adds xfuncname and word_regex patterns for Rust, a quite popular programming language. It also includes test cases for the xfuncname regex (t4018) and updated documentation. The word_regex pattern finds identifiers, integers, floats and operators, according to the Rust Reference Book. Cc: Johannes Sixt Signed-off-by: Marc-André Lureau Signed-off-by: Junio C Hamano

Merge branch 'ab/doc-misc-typofixes'

2019-04-16T10:28:08Z

Typofixes. * ab/doc-misc-typofixes: doc: fix typos in man pages

Merge branch 'ma/asciidoctor-fixes-more'

2019-04-16T10:28:04Z

Documentation mark-up fixes. * ma/asciidoctor-fixes-more: Documentation: turn middle-of-line tabs into spaces git-svn.txt: drop escaping '\' that ends up being rendered git.txt: remove empty line before list continuation config/fsck.txt: avoid starting line with dash config/diff.txt: drop spurious backtick

checkout: split part of it to new command 'switch'

2019-04-02T04:56:59Z

"git checkout" doing too many things is a source of confusion for many users (and it even bites old timers sometimes). To remedy that, the command will be split into two new ones: switch and restore. The good old "git checkout" command is still here and will be until all (or most of users) are sick of it. See the new man page for the final design of switch. The actual implementation though is still pretty much the same as "git checkout" and not completely aligned with the man page. Following patches will adjust their behavior to match the man page. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

doc: fix typos in man pages

2019-03-18T05:45:21Z

Signed-off-by: Alexander Blesius Signed-off-by: Junio C Hamano

Merge branch 'yb/utf-16le-bom-spellfix'

2019-03-11T07:16:24Z

Doc update. * yb/utf-16le-bom-spellfix: gitattributes.txt: fix typo