mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
Merge branch 'ja/doc-cleanup'
Doc update. * ja/doc-cleanup: init doc: --shared=0xxx does not give umask but perm bits doc: git-init: clarify file modes in octal. doc: git-http-push: describe the refs as pattern pairs doc: uniformize <URL> placeholders' case doc: use three dots for indicating repetition instead of star doc: git-ls-files: express options as optional alternatives doc: use only hyphens as word separators in placeholders doc: express grammar placeholders between angle brackets doc: split placeholders as individual tokens doc: fix git credential synopsis
This commit is contained in:
Junio C Hamano
commit
23c83fc473
|
|
@ -5,9 +5,9 @@ The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables
|
|||
support the following date formats:
|
||||
|
||||
Git internal format::
|
||||
It is `<unix timestamp> <time zone offset>`, where `<unix
|
||||
timestamp>` is the number of seconds since the UNIX epoch.
|
||||
`<time zone offset>` is a positive or negative offset from UTC.
|
||||
It is `<unix-timestamp> <time-zone-offset>`, where
|
||||
`<unix-timestamp>` is the number of seconds since the UNIX epoch.
|
||||
`<time-zone-offset>` is a positive or negative offset from UTC.
|
||||
For example CET (which is 1 hour ahead of UTC) is `+0100`.
|
||||
|
||||
RFC 2822::
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@ git-archimport - Import a GNU Arch repository into Git
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
|
||||
<archive/branch>[:<git-branch>] ...
|
||||
'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <depth>] [-t <tempdir>]
|
||||
<archive>/<branch>[:<git-branch>]...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
Imports a project from one or more GNU Arch repositories.
|
||||
It will follow branches
|
||||
and repositories within the namespaces defined by the <archive/branch>
|
||||
and repositories within the namespaces defined by the <archive>/<branch>
|
||||
parameters supplied. If it cannot find the remote branch a merge comes from
|
||||
it will just import it as a regular commit. If it can find it, it will mark it
|
||||
as a merge whenever possible (see discussion below).
|
||||
|
|
@ -27,7 +27,7 @@ import new branches within the provided roots.
|
|||
|
||||
It expects to be dealing with one project only. If it sees
|
||||
branches that have different roots, it will refuse to run. In that case,
|
||||
edit your <archive/branch> parameters to define clearly the scope of the
|
||||
edit your <archive>/<branch> parameters to define clearly the scope of the
|
||||
import.
|
||||
|
||||
'git archimport' uses `tla` extensively in the background to access the
|
||||
|
|
@ -42,7 +42,7 @@ incremental imports.
|
|||
|
||||
While 'git archimport' will try to create sensible branch names for the
|
||||
archives that it imports, it is also possible to specify Git branch names
|
||||
manually. To do so, write a Git branch name after each <archive/branch>
|
||||
manually. To do so, write a Git branch name after each <archive>/<branch>
|
||||
parameter, separated by a colon. This way, you can shorten the Arch
|
||||
branch names and convert Arch jargon to Git jargon, for example mapping a
|
||||
"PROJECT{litdd}devo{litdd}VERSION" branch to "master".
|
||||
|
|
@ -104,8 +104,8 @@ OPTIONS
|
|||
Override the default tempdir.
|
||||
|
||||
|
||||
<archive/branch>::
|
||||
Archive/branch identifier in a format that `tla log` understands.
|
||||
<archive>/<branch>::
|
||||
<archive>/<branch> identifier in a format that `tla log` understands.
|
||||
|
||||
|
||||
GIT
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ SYNOPSIS
|
|||
'git checkout' [-q] [-f] [-m] [<branch>]
|
||||
'git checkout' [-q] [-f] [-m] --detach [<branch>]
|
||||
'git checkout' [-q] [-f] [-m] [--detach] <commit>
|
||||
'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
|
||||
'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]
|
||||
'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...
|
||||
'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]
|
||||
'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]
|
||||
|
|
@ -43,7 +43,7 @@ You could omit `<branch>`, in which case the command degenerates to
|
|||
rather expensive side-effects to show only the tracking information,
|
||||
if exists, for the current branch.
|
||||
|
||||
'git checkout' -b|-B <new_branch> [<start point>]::
|
||||
'git checkout' -b|-B <new-branch> [<start-point>]::
|
||||
|
||||
Specifying `-b` causes a new branch to be created as if
|
||||
linkgit:git-branch[1] were called and then checked out. In
|
||||
|
|
@ -52,11 +52,11 @@ if exists, for the current branch.
|
|||
`--track` without `-b` implies branch creation; see the
|
||||
description of `--track` below.
|
||||
+
|
||||
If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it
|
||||
If `-B` is given, `<new-branch>` is created if it doesn't exist; otherwise, it
|
||||
is reset. This is the transactional equivalent of
|
||||
+
|
||||
------------
|
||||
$ git branch -f <branch> [<start point>]
|
||||
$ git branch -f <branch> [<start-point>]
|
||||
$ git checkout <branch>
|
||||
------------
|
||||
+
|
||||
|
|
@ -145,13 +145,13 @@ as `ours` (i.e. "our shared canonical history"), while what you did
|
|||
on your side branch as `theirs` (i.e. "one contributor's work on top
|
||||
of it").
|
||||
|
||||
-b <new_branch>::
|
||||
Create a new branch named `<new_branch>` and start it at
|
||||
`<start_point>`; see linkgit:git-branch[1] for details.
|
||||
-b <new-branch>::
|
||||
Create a new branch named `<new-branch>` and start it at
|
||||
`<start-point>`; see linkgit:git-branch[1] for details.
|
||||
|
||||
-B <new_branch>::
|
||||
Creates the branch `<new_branch>` and start it at `<start_point>`;
|
||||
if it already exists, then reset it to `<start_point>`. This is
|
||||
-B <new-branch>::
|
||||
Creates the branch `<new-branch>` and start it at `<start-point>`;
|
||||
if it already exists, then reset it to `<start-point>`. This is
|
||||
equivalent to running "git branch" with "-f"; see
|
||||
linkgit:git-branch[1] for details.
|
||||
|
||||
|
|
@ -210,16 +210,16 @@ variable.
|
|||
`<commit>` is not a branch name. See the "DETACHED HEAD" section
|
||||
below for details.
|
||||
|
||||
--orphan <new_branch>::
|
||||
Create a new 'orphan' branch, named `<new_branch>`, started from
|
||||
`<start_point>` and switch to it. The first commit made on this
|
||||
--orphan <new-branch>::
|
||||
Create a new 'orphan' branch, named `<new-branch>`, started from
|
||||
`<start-point>` and switch to it. The first commit made on this
|
||||
new branch will have no parents and it will be the root of a new
|
||||
history totally disconnected from all the other branches and
|
||||
commits.
|
||||
+
|
||||
The index and the working tree are adjusted as if you had previously run
|
||||
`git checkout <start_point>`. This allows you to start a new history
|
||||
that records a set of paths similar to `<start_point>` by easily running
|
||||
`git checkout <start-point>`. This allows you to start a new history
|
||||
that records a set of paths similar to `<start-point>` by easily running
|
||||
`git commit -a` to make the root commit.
|
||||
+
|
||||
This can be useful when you want to publish the tree from a commit
|
||||
|
|
@ -229,7 +229,7 @@ whose full history contains proprietary or otherwise encumbered bits of
|
|||
code.
|
||||
+
|
||||
If you want to start a disconnected history that records a set of paths
|
||||
that is totally different from the one of `<start_point>`, then you should
|
||||
that is totally different from the one of `<start-point>`, then you should
|
||||
clear the index and the working tree right after creating the orphan
|
||||
branch by running `git rm -rf .` from the top level of the working tree.
|
||||
Afterwards you will be ready to prepare your new files, repopulating the
|
||||
|
|
@ -341,10 +341,10 @@ As a special case, you may use `A...B` as a shortcut for the
|
|||
merge base of `A` and `B` if there is exactly one merge base. You can
|
||||
leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
|
||||
|
||||
<new_branch>::
|
||||
<new-branch>::
|
||||
Name for the new branch.
|
||||
|
||||
<start_point>::
|
||||
<start-point>::
|
||||
The name of a commit at which to start the new branch; see
|
||||
linkgit:git-branch[1] for details. Defaults to `HEAD`.
|
||||
+
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-cherry-pick - Apply the changes introduced by some existing commits
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
|
||||
'git cherry-pick' [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
|
||||
[-S[<keyid>]] <commit>...
|
||||
'git cherry-pick' (--continue | --skip | --abort | --quit)
|
||||
|
||||
|
|
@ -81,8 +81,8 @@ OPTIONS
|
|||
described above, and `-r` was to disable it. Now the
|
||||
default is not to do `-x` so this option is a no-op.
|
||||
|
||||
-m parent-number::
|
||||
--mainline parent-number::
|
||||
-m <parent-number>::
|
||||
--mainline <parent-number>::
|
||||
Usually you cannot cherry-pick a merge because you do not know which
|
||||
side of the merge should be considered the mainline. This
|
||||
option specifies the parent number (starting from 1) of
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ git-clone - Clone a repository into a new directory
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git clone' [--template=<template_directory>]
|
||||
'git clone' [--template=<template-directory>]
|
||||
[-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
|
||||
[-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
|
||||
[--dissociate] [--separate-git-dir <git dir>]
|
||||
[--dissociate] [--separate-git-dir <git-dir>]
|
||||
[--depth <depth>] [--[no-]single-branch] [--no-tags]
|
||||
[--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
|
||||
[--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]
|
||||
|
|
@ -211,7 +211,7 @@ objects from the source repository into a pack in the cloned repository.
|
|||
via ssh, this specifies a non-default path for the command
|
||||
run on the other end.
|
||||
|
||||
--template=<template_directory>::
|
||||
--template=<template-directory>::
|
||||
Specify the directory from which templates will be used;
|
||||
(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
|
||||
|
||||
|
|
@ -294,7 +294,7 @@ or `--mirror` is given)
|
|||
superproject's recorded SHA-1. Equivalent to passing `--remote` to
|
||||
`git submodule update`.
|
||||
|
||||
--separate-git-dir=<git dir>::
|
||||
--separate-git-dir=<git-dir>::
|
||||
Instead of placing the cloned repository where it is supposed
|
||||
to be, place the cloned repository at the specified directory,
|
||||
then make a filesystem-agnostic Git symbolic link to there.
|
||||
|
|
|
|||
|
|
@ -9,20 +9,20 @@ git-config - Get and set repository or global options
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] name [value [value-pattern]]
|
||||
'git config' [<file-option>] [--type=<type>] --add name value
|
||||
'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all name value [value-pattern]
|
||||
'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get name [value-pattern]
|
||||
'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all name [value-pattern]
|
||||
'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern]
|
||||
'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL
|
||||
'git config' [<file-option>] [--fixed-value] --unset name [value-pattern]
|
||||
'git config' [<file-option>] [--fixed-value] --unset-all name [value-pattern]
|
||||
'git config' [<file-option>] --rename-section old_name new_name
|
||||
'git config' [<file-option>] --remove-section name
|
||||
'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]
|
||||
'git config' [<file-option>] [--type=<type>] --add <name> <value>
|
||||
'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]
|
||||
'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]
|
||||
'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]
|
||||
'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]
|
||||
'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>
|
||||
'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]
|
||||
'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]
|
||||
'git config' [<file-option>] --rename-section <old-name> <new-name>
|
||||
'git config' [<file-option>] --remove-section <name>
|
||||
'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
|
||||
'git config' [<file-option>] --get-color name [default]
|
||||
'git config' [<file-option>] --get-colorbool name [stdout-is-tty]
|
||||
'git config' [<file-option>] --get-color <name> [<default>]
|
||||
'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]
|
||||
'git config' [<file-option>] -e | --edit
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -102,9 +102,9 @@ OPTIONS
|
|||
in which section and variable names are lowercased, but subsection
|
||||
names are not.
|
||||
|
||||
--get-urlmatch name URL::
|
||||
--get-urlmatch <name> <URL>::
|
||||
When given a two-part name section.key, the value for
|
||||
section.<url>.key whose <url> part matches the best to the
|
||||
section.<URL>.key whose <URL> part matches the best to the
|
||||
given URL is returned (if no such key exists, the value for
|
||||
section.key is used as a fallback). When given just the
|
||||
section as name, do so for all the keys in the section and
|
||||
|
|
@ -145,8 +145,8 @@ See also <<FILES>>.
|
|||
read from or written to if `extensions.worktreeConfig` is
|
||||
present. If not it's the same as `--local`.
|
||||
|
||||
-f config-file::
|
||||
--file config-file::
|
||||
-f <config-file>::
|
||||
--file <config-file>::
|
||||
For writing options: write to the specified file rather than the
|
||||
repository `.git/config`.
|
||||
+
|
||||
|
|
@ -155,7 +155,7 @@ available files.
|
|||
+
|
||||
See also <<FILES>>.
|
||||
|
||||
--blob blob::
|
||||
--blob <blob>::
|
||||
Similar to `--file` but use the given blob instead of a file. E.g.
|
||||
you can use 'master:.gitmodules' to read values from the file
|
||||
'.gitmodules' in the master branch. See "SPECIFYING REVISIONS"
|
||||
|
|
@ -246,18 +246,18 @@ Valid `<type>`'s include:
|
|||
all queried config options with the scope of that value
|
||||
(local, global, system, command).
|
||||
|
||||
--get-colorbool name [stdout-is-tty]::
|
||||
--get-colorbool <name> [<stdout-is-tty>]::
|
||||
|
||||
Find the color setting for `name` (e.g. `color.diff`) and output
|
||||
"true" or "false". `stdout-is-tty` should be either "true" or
|
||||
Find the color setting for `<name>` (e.g. `color.diff`) and output
|
||||
"true" or "false". `<stdout-is-tty>` should be either "true" or
|
||||
"false", and is taken into account when configuration says
|
||||
"auto". If `stdout-is-tty` is missing, then checks the standard
|
||||
"auto". If `<stdout-is-tty>` is missing, then checks the standard
|
||||
output of the command itself, and exits with status 0 if color
|
||||
is to be used, or exits with status 1 otherwise.
|
||||
When the color setting for `name` is undefined, the command uses
|
||||
`color.ui` as fallback.
|
||||
|
||||
--get-color name [default]::
|
||||
--get-color <name> [<default>]::
|
||||
|
||||
Find the color configured for `name` (e.g. `color.diff.new`) and
|
||||
output it as the ANSI color escape sequence to the standard
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-credential - Retrieve and store user credentials
|
|||
SYNOPSIS
|
||||
--------
|
||||
------------------
|
||||
git credential <fill|approve|reject>
|
||||
'git credential' (fill|approve|reject)
|
||||
------------------
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ git-cvsexportcommit - Export a single commit to a CVS checkout
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]
|
||||
[-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
|
||||
'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d <cvsroot>]
|
||||
[-w <cvs-workdir>] [-W] [-f] [-m <msgprefix>] [<parent-commit>] <commit-id>
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ SYNOPSIS
|
|||
[verse]
|
||||
'git cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>]
|
||||
[-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]
|
||||
[-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]
|
||||
[-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>]
|
||||
[-r <remote>] [-R] [<CVS_module>]
|
||||
[-C <git-repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]
|
||||
[-a] [-m] [-M <regex>] [-S <regex>] [-L <commit-limit>]
|
||||
[-r <remote>] [-R] [<CVS-module>]
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -59,7 +59,7 @@ OPTIONS
|
|||
from `CVS/Root`. If no such file exists, it checks for the
|
||||
`CVSROOT` environment variable.
|
||||
|
||||
<CVS_module>::
|
||||
<CVS-module>::
|
||||
The CVS module you want to import. Relative to <CVSROOT>.
|
||||
If not given, 'git cvsimport' tries to read it from
|
||||
`CVS/Repository`.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the index
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
|
||||
'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common-diff-options>] [<path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-diff-index - Compare a tree to the working tree or index
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...]
|
||||
'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ SYNOPSIS
|
|||
[verse]
|
||||
'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
|
||||
[-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
|
||||
[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
|
||||
[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ SYNOPSIS
|
|||
'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
|
||||
[--[no-]full] [--strict] [--verbose] [--lost-found]
|
||||
[--[no-]dangling] [--[no-]progress] [--connectivity-only]
|
||||
[--[no-]name-objects] [<object>*]
|
||||
[--[no-]name-objects] [<object>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-gui - A portable graphical interface to Git
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git gui' [<command>] [arguments]
|
||||
'git gui' [<command>] [<arguments>]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@ SYNOPSIS
|
|||
--------
|
||||
[verse]
|
||||
'git help' [-a|--all [--[no-]verbose]]
|
||||
[[-i|--info] [-m|--man] [-w|--web]] [COMMAND|GUIDE]
|
||||
[[-i|--info] [-m|--man] [-w|--web]] [<command>|<guide>]
|
||||
'git help' [-g|--guides]
|
||||
'git help' [-c|--config]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
||||
With no options and no COMMAND or GUIDE given, the synopsis of the 'git'
|
||||
With no options and no '<command>' or '<guide>' given, the synopsis of the 'git'
|
||||
command and a list of the most commonly used Git commands are printed
|
||||
on the standard output.
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ variables.
|
|||
|
||||
If an alias is given, git shows the definition of the alias on
|
||||
standard output. To get the manual page for the aliased command, use
|
||||
`git COMMAND --help`.
|
||||
`git <command> --help`.
|
||||
|
||||
Note that `git --help ...` is identical to `git help ...` because the
|
||||
former is internally converted into the latter.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-http-fetch - Download from a remote Git repository via HTTP
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>
|
||||
'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-http-push - Push objects over HTTP/DAV to another repository
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]
|
||||
'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -63,16 +63,15 @@ of such patterns separated by a colon ":" (this means that a ref name
|
|||
cannot have a colon in it). A single pattern '<name>' is just a
|
||||
shorthand for '<name>:<name>'.
|
||||
|
||||
Each pattern pair consists of the source side (before the colon)
|
||||
and the destination side (after the colon). The ref to be
|
||||
pushed is determined by finding a match that matches the source
|
||||
side, and where it is pushed is determined by using the
|
||||
destination side.
|
||||
Each pattern pair '<src>:<dst>' consists of the source side (before
|
||||
the colon) and the destination side (after the colon). The ref to be
|
||||
pushed is determined by finding a match that matches the source side,
|
||||
and where it is pushed is determined by using the destination side.
|
||||
|
||||
- It is an error if <src> does not match exactly one of the
|
||||
- It is an error if '<src>' does not match exactly one of the
|
||||
local refs.
|
||||
|
||||
- If <dst> does not match any remote ref, either
|
||||
- If '<dst>' does not match any remote ref, either
|
||||
|
||||
* it has to start with "refs/"; <dst> is used as the
|
||||
destination literally in this case.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-init-db - Creates an empty Git repository
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]
|
||||
'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ git-init - Create an empty Git repository or reinitialize an existing one
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
|
||||
[--separate-git-dir <git dir>] [--object-format=<format>]
|
||||
'git init' [-q | --quiet] [--bare] [--template=<template-directory>]
|
||||
[--separate-git-dir <git-dir>] [--object-format=<format>]
|
||||
[-b <branch-name> | --initial-branch=<branch-name>]
|
||||
[--shared[=<permissions>]] [directory]
|
||||
[--shared[=<permissions>]] [<directory>]
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -57,12 +57,12 @@ values are 'sha1' and (if enabled) 'sha256'. 'sha1' is the default.
|
|||
+
|
||||
include::object-format-disclaimer.txt[]
|
||||
|
||||
--template=<template_directory>::
|
||||
--template=<template-directory>::
|
||||
|
||||
Specify the directory from which templates will be used. (See the "TEMPLATE
|
||||
DIRECTORY" section below.)
|
||||
|
||||
--separate-git-dir=<git dir>::
|
||||
--separate-git-dir=<git-dir>::
|
||||
|
||||
Instead of initializing the repository as a directory to either `$GIT_DIR` or
|
||||
`./.git/`, create a text file there containing the path to the actual
|
||||
|
|
@ -79,7 +79,7 @@ repository. If not specified, fall back to the default name (currently
|
|||
`master`, but this is subject to change in the future; the name can be
|
||||
customized via the `init.defaultBranch` configuration variable).
|
||||
|
||||
--shared[=(false|true|umask|group|all|world|everybody|0xxx)]::
|
||||
--shared[=(false|true|umask|group|all|world|everybody|<perm>)]::
|
||||
|
||||
Specify that the Git repository is to be shared amongst several users. This
|
||||
allows users belonging to the same group to push into that
|
||||
|
|
@ -110,13 +110,16 @@ the repository permissions.
|
|||
|
||||
Same as 'group', but make the repository readable by all users.
|
||||
|
||||
'0xxx'::
|
||||
'<perm>'::
|
||||
|
||||
'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will
|
||||
override users' umask(2) value (and not only loosen permissions as 'group' and
|
||||
'all' does). '0640' will create a repository which is group-readable, but not
|
||||
group-writable or accessible to others. '0660' will create a repo that is
|
||||
readable and writable to the current user and group, but inaccessible to others.
|
||||
'<perm>' is a 3-digit octal number prefixed with `0` and each file
|
||||
will have mode '<perm>'. '<perm>' will override users' umask(2)
|
||||
value (and not only loosen permissions as 'group' and 'all'
|
||||
does). '0640' will create a repository which is group-readable, but
|
||||
not group-writable or accessible to others. '0660' will create a repo
|
||||
that is readable and writable to the current user and group, but
|
||||
inaccessible to others (directories and executable files get their
|
||||
`x` bit from the `r` bit for corresponding classes of users).
|
||||
--
|
||||
|
||||
By default, the configuration flag `receive.denyNonFastForwards` is enabled
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-log - Show commit logs
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git log' [<options>] [<revision range>] [[--] <path>...]
|
||||
'git log' [<options>] [<revision-range>] [[--] <path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -81,13 +81,13 @@ produced by `--stat`, etc.
|
|||
|
||||
include::line-range-options.txt[]
|
||||
|
||||
<revision range>::
|
||||
<revision-range>::
|
||||
Show only commits in the specified revision range. When no
|
||||
<revision range> is specified, it defaults to `HEAD` (i.e. the
|
||||
<revision-range> is specified, it defaults to `HEAD` (i.e. the
|
||||
whole history leading to the current commit). `origin..HEAD`
|
||||
specifies all the commits reachable from the current commit
|
||||
(i.e. `HEAD`), but not from `origin`. For a complete list of
|
||||
ways to spell <revision range>, see the 'Specifying Ranges'
|
||||
ways to spell <revision-range>, see the 'Specifying Ranges'
|
||||
section of linkgit:gitrevisions[7].
|
||||
|
||||
[--] <path>...::
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ SYNOPSIS
|
|||
--------
|
||||
[verse]
|
||||
'git ls-files' [-z] [-t] [-v] [-f]
|
||||
(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*
|
||||
(-[c|d|o|i|s|u|k|m])*
|
||||
[--eol]
|
||||
[-c|--cached] [-d|--deleted] [-o|--others] [-i|--|ignored]
|
||||
[-s|--stage] [-u|--unmerged] [-k|--|killed] [-m|--modified]
|
||||
[--directory [--no-empty-directory]] [--eol]
|
||||
[--deduplicate]
|
||||
[-x <pattern>|--exclude=<pattern>]
|
||||
[-X <file>|--exclude-from=<file>]
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-merge-index - Run a merge for files needing merging
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*)
|
||||
'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ git-p4 - Import from and submit to Perforce repositories
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git p4 clone' [<sync options>] [<clone options>] <p4 depot path>...
|
||||
'git p4 sync' [<sync options>] [<p4 depot path>...]
|
||||
'git p4 clone' [<sync-options>] [<clone-options>] <p4-depot-path>...
|
||||
'git p4 sync' [<sync-options>] [<p4-depot-path>...]
|
||||
'git p4 rebase'
|
||||
'git p4 submit' [<submit options>] [<master branch name>]
|
||||
'git p4 submit' [<submit-options>] [<master-branch-name>]
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -361,7 +361,7 @@ These options can be used to modify 'git p4 submit' behavior.
|
|||
p4/master. See the "Sync options" section above for more
|
||||
information.
|
||||
|
||||
--commit <sha1>|<sha1..sha1>::
|
||||
--commit (<sha1>|<sha1>..<sha1>)::
|
||||
Submit only the specified commit or range of commits, instead of the full
|
||||
list of changes that are in the current Git branch.
|
||||
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ SYNOPSIS
|
|||
[--no-reuse-delta] [--delta-base-offset] [--non-empty]
|
||||
[--local] [--incremental] [--window=<n>] [--depth=<n>]
|
||||
[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
|
||||
[--stdout [--filter=<filter-spec>] | base-name]
|
||||
[--shallow] [--keep-true-parents] [--[no-]sparse] < object-list
|
||||
[--stdout [--filter=<filter-spec>] | <base-name>]
|
||||
[--shallow] [--keep-true-parents] [--[no-]sparse] < <object-list>
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-pack-redundant - Find redundant pack files
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >
|
||||
'git pack-redundant' [ --verbose ] [ --alt-odb ] ( --all | <pack-filename>... )
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ The command takes various subcommands, and different options
|
|||
depending on the subcommand:
|
||||
|
||||
[verse]
|
||||
'git reflog' ['show'] [log-options] [<ref>]
|
||||
'git reflog' ['show'] [<log-options>] [<ref>]
|
||||
'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]
|
||||
[--rewrite] [--updateref] [--stale-fix]
|
||||
[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]
|
||||
'git reflog delete' [--rewrite] [--updateref]
|
||||
[--dry-run | -n] [--verbose] ref@\{specifier\}...
|
||||
[--dry-run | -n] [--verbose] <ref>@\{<specifier>\}...
|
||||
'git reflog exists' <ref>
|
||||
|
||||
Reference logs, or "reflogs", record when the tips of branches and
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ SYNOPSIS
|
|||
--------
|
||||
[verse]
|
||||
'git remote' [-v | --verbose]
|
||||
'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>
|
||||
'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
|
||||
'git remote rename' <old> <new>
|
||||
'git remote remove' <name>
|
||||
'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
|
||||
|
|
@ -18,7 +18,7 @@ SYNOPSIS
|
|||
'git remote get-url' [--push] [--all] <name>
|
||||
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
|
||||
'git remote set-url --add' [--push] <name> <newurl>
|
||||
'git remote set-url --delete' [--push] <name> <url>
|
||||
'git remote set-url --delete' [--push] <name> <URL>
|
||||
'git remote' [-v | --verbose] 'show' [-n] <name>...
|
||||
'git remote prune' [-n | --dry-run] <name>...
|
||||
'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
|
||||
|
|
@ -47,7 +47,7 @@ subcommands are available to perform operations on the remotes.
|
|||
'add'::
|
||||
|
||||
Add a remote named <name> for the repository at
|
||||
<url>. The command `git fetch <name>` can then be used to create and
|
||||
<URL>. The command `git fetch <name>` can then be used to create and
|
||||
update remote-tracking branches <name>/<branch>.
|
||||
+
|
||||
With `-f` option, `git fetch <name>` is run immediately after
|
||||
|
|
@ -152,7 +152,7 @@ With `--push`, push URLs are manipulated instead of fetch URLs.
|
|||
With `--add`, instead of changing existing URLs, new URL is added.
|
||||
+
|
||||
With `--delete`, instead of changing existing URLs, all URLs matching
|
||||
regex <url> are deleted for remote <name>. Trying to delete all
|
||||
regex <URL> are deleted for remote <name>. Trying to delete all
|
||||
non-push URLs is an error.
|
||||
+
|
||||
Note that the push URL and the fetch URL, even though they can
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-request-pull - Generates a summary of pending changes
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git request-pull' [-p] <start> <url> [<end>]
|
||||
'git request-pull' [-p] <start> <URL> [<end>]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
@ -21,7 +21,7 @@ the changes and indicates from where they can be pulled.
|
|||
The upstream project is expected to have the commit named by
|
||||
`<start>` and the output asks it to integrate the changes you made
|
||||
since that commit, up to the commit named by `<end>`, by visiting
|
||||
the repository named by `<url>`.
|
||||
the repository named by `<URL>`.
|
||||
|
||||
|
||||
OPTIONS
|
||||
|
|
@ -33,14 +33,14 @@ OPTIONS
|
|||
Commit to start at. This names a commit that is already in
|
||||
the upstream history.
|
||||
|
||||
<url>::
|
||||
<URL>::
|
||||
The repository URL to be pulled from.
|
||||
|
||||
<end>::
|
||||
Commit to end at (defaults to HEAD). This names the commit
|
||||
at the tip of the history you are asking to be pulled.
|
||||
+
|
||||
When the repository named by `<url>` has the commit at a tip of a
|
||||
When the repository named by `<URL>` has the commit at a tip of a
|
||||
ref that is different from the ref you have locally, you can use the
|
||||
`<local>:<remote>` syntax, to have its local name, a colon `:`, and
|
||||
its remote name.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-shortlog - Summarize 'git log' output
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git shortlog' [<options>] [<revision range>] [[--] <path>...]
|
||||
'git shortlog' [<options>] [<revision-range>] [[--] <path>...]
|
||||
git log --pretty=short | 'git shortlog' [<options>]
|
||||
|
||||
DESCRIPTION
|
||||
|
|
@ -89,13 +89,13 @@ counts both authors and co-authors.
|
|||
If width is `0` (zero) then indent the lines of the output without wrapping
|
||||
them.
|
||||
|
||||
<revision range>::
|
||||
<revision-range>::
|
||||
Show only commits in the specified revision range. When no
|
||||
<revision range> is specified, it defaults to `HEAD` (i.e. the
|
||||
<revision-range> is specified, it defaults to `HEAD` (i.e. the
|
||||
whole history leading to the current commit). `origin..HEAD`
|
||||
specifies all the commits reachable from the current commit
|
||||
(i.e. `HEAD`), but not from `origin`. For a complete list of
|
||||
ways to spell <revision range>, see the "Specifying Ranges"
|
||||
ways to spell <revision-range>, see the "Specifying Ranges"
|
||||
section of linkgit:gitrevisions[7].
|
||||
|
||||
[--] <path>...::
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ given by a list of patterns.
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git sparse-checkout <subcommand> [options]'
|
||||
'git sparse-checkout <subcommand> [<options>]'
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ git-stage - Add file contents to the staging area
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git stage' args...
|
||||
'git stage' <arg>...
|
||||
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
|||
|
|
@ -575,7 +575,7 @@ OPTIONS
|
|||
-------
|
||||
|
||||
--shared[=(false|true|umask|group|all|world|everybody)]::
|
||||
--template=<template_directory>::
|
||||
--template=<template-directory>::
|
||||
Only used with the 'init' command.
|
||||
These are passed directly to 'git init'.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ git-web--browse - Git helper script to launch a web browser
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git web{litdd}browse' [<options>] <url|file>...
|
||||
'git web{litdd}browse' [<options>] (<URL>|<file>)...
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ because the hostnames differ. Nor would it match `foo.example.com`; Git
|
|||
compares hostnames exactly, without considering whether two hosts are part of
|
||||
the same domain. Likewise, a config entry for `http://example.com` would not
|
||||
match: Git compares the protocols exactly. However, you may use wildcards in
|
||||
the domain name and other pattern matching techniques as with the `http.<url>.*`
|
||||
the domain name and other pattern matching techniques as with the `http.<URL>.*`
|
||||
options.
|
||||
|
||||
If the "pattern" URL does include a path component, then this too must match
|
||||
|
|
@ -147,7 +147,7 @@ CONFIGURATION OPTIONS
|
|||
|
||||
Options for a credential context can be configured either in
|
||||
`credential.*` (which applies to all credentials), or
|
||||
`credential.<url>.*`, where <url> matches the context as described
|
||||
`credential.<URL>.*`, where <URL> matches the context as described
|
||||
above.
|
||||
|
||||
The following options are available in either location:
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@ Workflow for a third party library
|
|||
----------------------------------
|
||||
|
||||
# Add a submodule
|
||||
git submodule add <url> <path>
|
||||
git submodule add <URL> <path>
|
||||
|
||||
# Occasionally update the submodule to a new version:
|
||||
git -C <path> checkout <new version>
|
||||
|
|
|
|||
|
|
@ -394,7 +394,7 @@ request to do so by mail. Such a request looks like
|
|||
|
||||
-------------------------------------
|
||||
Please pull from
|
||||
<url> <branch>
|
||||
<URL> <branch>
|
||||
-------------------------------------
|
||||
|
||||
In that case, 'git pull' can do the fetch and merge in one go, as
|
||||
|
|
@ -403,7 +403,7 @@ follows.
|
|||
.Push/pull: Merging remote topics
|
||||
[caption="Recipe: "]
|
||||
=====================================
|
||||
`git pull <url> <branch>`
|
||||
`git pull <URL> <branch>`
|
||||
=====================================
|
||||
|
||||
Occasionally, the maintainer may get merge conflicts when they try to
|
||||
|
|
@ -440,7 +440,7 @@ merge because you cannot format-patch merges):
|
|||
.format-patch/am: Keeping topics up to date
|
||||
[caption="Recipe: "]
|
||||
=====================================
|
||||
`git pull --rebase <url> <branch>`
|
||||
`git pull --rebase <URL> <branch>`
|
||||
=====================================
|
||||
|
||||
You can then fix the conflicts during the rebase. Presumably you have
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ built-in formats:
|
|||
|
||||
* 'oneline'
|
||||
|
||||
<hash> <title line>
|
||||
<hash> <title-line>
|
||||
+
|
||||
This is designed to be as compact as possible.
|
||||
|
||||
|
|
@ -29,17 +29,17 @@ This is designed to be as compact as possible.
|
|||
commit <hash>
|
||||
Author: <author>
|
||||
|
||||
<title line>
|
||||
<title-line>
|
||||
|
||||
* 'medium'
|
||||
|
||||
commit <hash>
|
||||
Author: <author>
|
||||
Date: <author date>
|
||||
Date: <author-date>
|
||||
|
||||
<title line>
|
||||
<title-line>
|
||||
|
||||
<full commit message>
|
||||
<full-commit-message>
|
||||
|
||||
* 'full'
|
||||
|
||||
|
|
@ -47,25 +47,25 @@ This is designed to be as compact as possible.
|
|||
Author: <author>
|
||||
Commit: <committer>
|
||||
|
||||
<title line>
|
||||
<title-line>
|
||||
|
||||
<full commit message>
|
||||
<full-commit-message>
|
||||
|
||||
* 'fuller'
|
||||
|
||||
commit <hash>
|
||||
Author: <author>
|
||||
AuthorDate: <author date>
|
||||
AuthorDate: <author-date>
|
||||
Commit: <committer>
|
||||
CommitDate: <committer date>
|
||||
CommitDate: <committer-date>
|
||||
|
||||
<title line>
|
||||
<title-line>
|
||||
|
||||
<full commit message>
|
||||
<full-commit-message>
|
||||
|
||||
* 'reference'
|
||||
|
||||
<abbrev hash> (<title line>, <short author date>)
|
||||
<abbrev-hash> (<title-line>, <short-author-date>)
|
||||
+
|
||||
This format is used to refer to another commit in a commit message and
|
||||
is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default,
|
||||
|
|
@ -78,10 +78,10 @@ placeholders, its output is not affected by other options like
|
|||
|
||||
From <hash> <date>
|
||||
From: <author>
|
||||
Date: <author date>
|
||||
Subject: [PATCH] <title line>
|
||||
Date: <author-date>
|
||||
Subject: [PATCH] <title-line>
|
||||
|
||||
<full commit message>
|
||||
<full-commit-message>
|
||||
|
||||
* 'mboxrd'
|
||||
+
|
||||
|
|
@ -101,9 +101,9 @@ commits are displayed, but not the way the diff is shown e.g. with
|
|||
`git log --raw`. To get full object names in a raw diff format,
|
||||
use `--no-abbrev`.
|
||||
|
||||
* 'format:<string>'
|
||||
* 'format:<format-string>'
|
||||
+
|
||||
The 'format:<string>' format allows you to specify which information
|
||||
The 'format:<format-string>' format allows you to specify which information
|
||||
you want to show. It works a little bit like printf format,
|
||||
with the notable exception that you get a newline with '%n'
|
||||
instead of '\n'.
|
||||
|
|
@ -273,12 +273,12 @@ endif::git-rev-list[]
|
|||
If any option is provided multiple times the
|
||||
last occurrence wins.
|
||||
+
|
||||
The boolean options accept an optional value `[=<BOOL>]`. The values
|
||||
The boolean options accept an optional value `[=<value>]`. The values
|
||||
`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
|
||||
sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
|
||||
option is given with no value, it's enabled.
|
||||
+
|
||||
** 'key=<K>': only show trailers with specified key. Matching is done
|
||||
** 'key=<key>': only show trailers with specified <key>. Matching is done
|
||||
case-insensitively and trailing colon is optional. If option is
|
||||
given multiple times trailer lines matching any of the keys are
|
||||
shown. This option automatically enables the `only` option so that
|
||||
|
|
@ -286,25 +286,25 @@ option is given with no value, it's enabled.
|
|||
desired it can be disabled with `only=false`. E.g.,
|
||||
`%(trailers:key=Reviewed-by)` shows trailer lines with key
|
||||
`Reviewed-by`.
|
||||
** 'only[=<BOOL>]': select whether non-trailer lines from the trailer
|
||||
** 'only[=<bool>]': select whether non-trailer lines from the trailer
|
||||
block should be included.
|
||||
** 'separator=<SEP>': specify a separator inserted between trailer
|
||||
** 'separator=<sep>': specify a separator inserted between trailer
|
||||
lines. When this option is not given each trailer line is
|
||||
terminated with a line feed character. The string SEP may contain
|
||||
terminated with a line feed character. The string <sep> may contain
|
||||
the literal formatting codes described above. To use comma as
|
||||
separator one must use `%x2C` as it would otherwise be parsed as
|
||||
next option. E.g., `%(trailers:key=Ticket,separator=%x2C )`
|
||||
shows all trailer lines whose key is "Ticket" separated by a comma
|
||||
and a space.
|
||||
** 'unfold[=<BOOL>]': make it behave as if interpret-trailer's `--unfold`
|
||||
** 'unfold[=<bool>]': make it behave as if interpret-trailer's `--unfold`
|
||||
option was given. E.g.,
|
||||
`%(trailers:only,unfold=true)` unfolds and shows all trailer lines.
|
||||
** 'keyonly[=<BOOL>]': only show the key part of the trailer.
|
||||
** 'valueonly[=<BOOL>]': only show the value part of the trailer.
|
||||
** 'key_value_separator=<SEP>': specify a separator inserted between
|
||||
** 'keyonly[=<bool>]': only show the key part of the trailer.
|
||||
** 'valueonly[=<bool>]': only show the value part of the trailer.
|
||||
** 'key_value_separator=<sep>': specify a separator inserted between
|
||||
trailer lines. When this option is not given each trailer key-value
|
||||
pair is separated by ": ". Otherwise it shares the same semantics
|
||||
as 'separator=<SEP>' above.
|
||||
as 'separator=<sep>' above.
|
||||
|
||||
NOTE: Some placeholders may depend on other options given to the
|
||||
revision traversal engine. For example, the `%g*` reflog options will
|
||||
|
|
|
|||
|
|
@ -26,14 +26,14 @@ config file would appear like this:
|
|||
|
||||
------------
|
||||
[remote "<name>"]
|
||||
url = <url>
|
||||
url = <URL>
|
||||
pushurl = <pushurl>
|
||||
push = <refspec>
|
||||
fetch = <refspec>
|
||||
------------
|
||||
|
||||
The `<pushurl>` is used for pushes only. It is optional and defaults
|
||||
to `<url>`.
|
||||
to `<URL>`.
|
||||
|
||||
Named file in `$GIT_DIR/remotes`
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
|
@ -67,10 +67,10 @@ This file should have the following format:
|
|||
|
||||
|
||||
------------
|
||||
<url>#<head>
|
||||
<URL>#<head>
|
||||
------------
|
||||
|
||||
`<url>` is required; `#<head>` is optional.
|
||||
`<URL>` is required; `#<head>` is optional.
|
||||
|
||||
Depending on the operation, git will use one of the following
|
||||
refspecs, if you don't provide one on the command line.
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include "config.h"
|
||||
|
||||
static const char usage_msg[] =
|
||||
"git credential [fill|approve|reject]";
|
||||
"git credential (fill|approve|reject)";
|
||||
|
||||
int cmd_credential(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue