From: Junio C Hamano Date: Wed, 25 Apr 2018 04:28:58 +0000 (+0900) Subject: Merge branch 'en/doc-typoes' X-Git-Tag: v2.18.0-rc0~119 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cb6462fe7435657fbd905018e9b3c76f1d946832?hp=-c Merge branch 'en/doc-typoes' Docfix. * en/doc-typoes: Documentation: normalize spelling of 'normalised' Documentation: fix several one-character-off spelling errors --- cb6462fe7435657fbd905018e9b3c76f1d946832 diff --combined Documentation/diff-options.txt index e3a44f03cd,ee4046e155..f466600972 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@@ -128,14 -128,6 +128,14 @@@ have to use `--diff-algorithm=default` These parameters can also be set individually with `--stat-width=`, `--stat-name-width=` and `--stat-count=`. +--compact-summary:: + Output a condensed summary of extended header information such + as file creations or deletions ("new" or "gone", optionally "+l" + if it's a symlink) and mode changes ("+x" or "-x" for adding + or removing executable bit respectively) in diffstat. The + information is put betwen the filename part and the graph + part. Implies `--stat`. + --numstat:: Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without @@@ -516,15 -508,6 +516,15 @@@ occurrences of that string did not chan See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information. +--find-object=:: + Look for differences that change the number of occurrences of + the specified object. Similar to `-S`, just the argument is different + in that it doesn't search for a specific string but for a specific + object id. ++ +The object can be a blob or a submodule commit. It implies the `-t` option in +`git-log` to also find trees. + --pickaxe-all:: When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change @@@ -533,7 -516,6 +533,7 @@@ --pickaxe-regex:: Treat the given to `-S` as an extended POSIX regular expression to match. + endif::git-format-patch[] -O:: @@@ -568,7 -550,7 +568,7 @@@ the normal order -- + Patterns have the same syntax and semantics as patterns used for - fnmantch(3) without the FNM_PATHNAME flag, except a pathname also + fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "`foo*bar`" matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`". @@@ -592,7 -574,7 +592,7 @@@ endif::git-format-patch[ Treat all files as text. --ignore-cr-at-eol:: - Ignore carrige-return at the end of line when doing a comparison. + Ignore carriage-return at the end of line when doing a comparison. --ignore-space-at-eol:: Ignore changes in whitespace at EOL. diff --combined Documentation/git-send-email.txt index af07840b4f,861ac13d20..60cf96f4c1 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@@ -84,11 -84,6 +84,11 @@@ See the CONFIGURATION section for `send the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not set, as returned by "git var -l". +--reply-to=
:: + Specify the address where replies from recipients should go to. + Use this if replies to messages should go to another address than what + is specified with the --from parameter. + --in-reply-to=:: Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to @@@ -255,7 -250,7 +255,7 @@@ must be used for each option --batch-size=:: Some email servers (e.g. smtp.163.com) limit the number emails to be - sent per session (connection) and this will lead to a faliure when + sent per session (connection) and this will lead to a failure when sending many messages. With this option, send-email will disconnect after sending $ messages and wait for a few seconds (see --relogin-delay) and reconnect, to work around such a limit. You may want to @@@ -473,7 -468,16 +473,7 @@@ edit ~/.gitconfig to specify your accou If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit -https://security.google.com/settings/security/apppasswords to setup an -app-specific password. Once setup, you can store it with the credentials -helper: - - $ git credential fill - protocol=smtp - host=smtp.gmail.com - username=youname@gmail.com - password=app-password - +https://security.google.com/settings/security/apppasswords to create it. Once your commits are ready to be sent to the mailing list, run the following commands: @@@ -482,11 -486,6 +482,11 @@@ $ edit outgoing/0000-* $ git send-email outgoing/* +The first time you run it, you will be prompted for your credentials. Enter the +app-specific or your regular password as appropriate. If you have credential +helper configured (see linkgit:git-credential[1]), the password will be saved in +the credential store so you won't have to type it the next time. + Note: the following perl modules are required Net::SMTP::SSL, MIME::Base64 and Authen::SASL diff --combined Documentation/git-status.txt index 6c230c0c72,84b140dbdc..c16e27e63d --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@@ -113,7 -113,7 +113,7 @@@ The possible options are - 'matching' - Shows ignored files and directories matching an ignore pattern. + - When 'matching' mode is specified, paths that explicity match an + When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are @@@ -130,11 -130,6 +130,11 @@@ ignored, then the directory is not show without options are equivalent to 'always' and 'never' respectively. +--ahead-behind:: +--no-ahead-behind:: + Display or do not display detailed ahead/behind counts for the + branch relative to its upstream branch. Defaults to true. + ...:: See the 'pathspec' entry in linkgit:gitglossary[7].