From: Junio C Hamano Date: Wed, 23 May 2018 05:38:23 +0000 (+0900) Subject: Merge branch 'ah/misc-doc-updates' X-Git-Tag: v2.18.0-rc0~42 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/be75d12982e614685f47bff67676eb69c60bf624?hp=-c Merge branch 'ah/misc-doc-updates' Misc doc fixes. * ah/misc-doc-updates: doc: normalize [--options] to [options] in git-diff doc: add note about shell quoting to revision.txt git-svn: remove ''--add-author-from' for 'commit-diff' doc: add '-d' and '-o' for 'git push' doc: clarify ignore rules for git ls-files doc: align 'diff --no-index' in text and synopsis doc: improve formatting in githooks.txt --- be75d12982e614685f47bff67676eb69c60bf624 diff --combined Documentation/git-ls-files.txt index 0f2cee7c26,f3474b2ede..5298f1bc30 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@@ -53,7 -53,8 +53,8 @@@ OPTION Show only ignored files in the output. When showing files in the index, print only those matched by an exclude pattern. When showing "other" files, show only those matched by an exclude - pattern. + pattern. Standard ignore rules are not automatically activated, + therefore at least one of the `--exclude*` options is required. -s:: --stage:: @@@ -183,7 -184,7 +184,7 @@@ followed by the ("attr/") Files to show. If no files are given all files which match the other specified criteria are shown. -Output +OUTPUT ------ 'git ls-files' just outputs the filenames unless `--stage` is specified in which case it outputs: @@@ -208,7 -209,7 +209,7 @@@ quoted as explained for the configurati verbatim and the line is terminated by a NUL byte. -Exclude Patterns +EXCLUDE PATTERNS ---------------- 'git ls-files' can use a list of "exclude patterns" when diff --combined Documentation/git-push.txt index 02f6501399,f2bbda6e32..55277a9781 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@@ -11,7 -11,7 +11,7 @@@ SYNOPSI [verse] 'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=] [--repo=] [-f | --force] [-d | --delete] [--prune] [-v | --verbose] - [-u | --set-upstream] [--push-option=] + [-u | --set-upstream] [-o | --push-option=] [--[no-]signed|--signed=(true|false|if-asked)] [--force-with-lease[=[:]]] [--no-verify] [ [...]] @@@ -123,6 -123,7 +123,7 @@@ already exists on the remote side will be tab-separated and sent to stdout instead of stderr. The full symbolic names of the refs will be given. + -d:: --delete:: All listed refs are deleted from the remote repository. This is the same as prefixing all refs with a colon. @@@ -300,7 -301,7 +301,7 @@@ origin +master` to force a push to the These options are passed to linkgit:git-send-pack[1]. A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is - \--thin. + `--thin`. -q:: --quiet:: @@@ -423,7 -424,7 +424,7 @@@ reason: refs, no explanation is needed. For a failed ref, the reason for failure is described. -Note about fast-forwards +NOTE ABOUT FAST-FORWARDS ------------------------ When an update changes a branch (or more in general, a ref) that used to @@@ -510,7 -511,7 +511,7 @@@ overwrite it. In other words, "git pus a case where you do mean to lose history. -Examples +EXAMPLES -------- `git push`:: diff --combined Documentation/git-svn.txt index d59379ee23,11aefadf7a..e9615951d2 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@@ -635,8 -635,7 +635,8 @@@ config key: svn.findcopiesharde -A:: --authors-file=:: - Syntax is compatible with the file used by 'git cvsimport': + Syntax is compatible with the file used by 'git cvsimport' but + an empty email address can be supplied with '<>': + ------------------------------------------------------------------------ loginname = Joe User @@@ -655,14 -654,8 +655,14 @@@ config key: svn.authorsfil If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is - expected to return a single line of the form "Name ", - which will be treated as if included in the authors file. + expected to return a single line of the form "Name " or + "Name <>", which will be treated as if included in the authors + file. ++ +Due to historical reasons a relative 'filename' is first searched +relative to the current directory for 'init' and 'clone' and relative +to the root of the working tree for 'fetch'. If 'filename' is +not found, it is searched like any other command in '$PATH'. + [verse] config key: svn.authorsProg @@@ -707,7 -700,7 +707,7 @@@ creating the branch or tag config key: svn.useLogAuthor --add-author-from:: - When committing to svn from Git (as part of 'commit-diff', 'set-tree' or 'dcommit' + When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by:` line, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author`