Merge branch 'po/maint-docs' into maint
* po/maint-docs: Doc branch: show -vv option and alternative Doc clean: add See Also link Doc add: link gitignore Doc: separate gitignore pattern sources Doc: shallow clone deepens _to_ new depth
This commit is contained in:
commit
756583f432
@ -10,7 +10,8 @@
|
|||||||
--depth=<depth>::
|
--depth=<depth>::
|
||||||
Deepen the history of a 'shallow' repository created by
|
Deepen the history of a 'shallow' repository created by
|
||||||
`git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
|
`git clone` with `--depth=<depth>` option (see linkgit:git-clone[1])
|
||||||
by the specified number of commits.
|
to the specified number of commits from the tip of each remote
|
||||||
|
branch history. Tags for the deepened commits are not fetched.
|
||||||
|
|
||||||
ifndef::git-pull[]
|
ifndef::git-pull[]
|
||||||
--dry-run::
|
--dry-run::
|
||||||
|
@ -155,7 +155,7 @@ Configuration
|
|||||||
The optional configuration variable `core.excludesfile` indicates a path to a
|
The optional configuration variable `core.excludesfile` indicates a path to a
|
||||||
file containing patterns of file names to exclude from git-add, similar to
|
file containing patterns of file names to exclude from git-add, similar to
|
||||||
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
|
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
|
||||||
those in info/exclude. See linkgit:gitrepository-layout[5].
|
those in info/exclude. See linkgit:gitignore[5].
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
|
@ -129,11 +129,13 @@ This option is only applicable in non-verbose mode.
|
|||||||
use `git branch --list <pattern>` to list matching branches.
|
use `git branch --list <pattern>` to list matching branches.
|
||||||
|
|
||||||
-v::
|
-v::
|
||||||
|
-vv::
|
||||||
--verbose::
|
--verbose::
|
||||||
When in list mode,
|
When in list mode,
|
||||||
show sha1 and commit subject line for each head, along with
|
show sha1 and commit subject line for each head, along with
|
||||||
relationship to upstream branch (if any). If given twice, print
|
relationship to upstream branch (if any). If given twice, print
|
||||||
the name of the upstream branch, as well.
|
the name of the upstream branch, as well (see also `git remote
|
||||||
|
show <remote>`).
|
||||||
|
|
||||||
-q::
|
-q::
|
||||||
--quiet::
|
--quiet::
|
||||||
|
@ -63,6 +63,10 @@ OPTIONS
|
|||||||
Remove only files ignored by git. This may be useful to rebuild
|
Remove only files ignored by git. This may be useful to rebuild
|
||||||
everything from scratch, but keep manually created files.
|
everything from scratch, but keep manually created files.
|
||||||
|
|
||||||
|
SEE ALSO
|
||||||
|
--------
|
||||||
|
linkgit:gitignore[5]
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
---
|
---
|
||||||
Part of the linkgit:git[1] suite
|
Part of the linkgit:git[1] suite
|
||||||
|
@ -41,18 +41,24 @@ precedence, the last matching pattern decides the outcome):
|
|||||||
variable 'core.excludesfile'.
|
variable 'core.excludesfile'.
|
||||||
|
|
||||||
Which file to place a pattern in depends on how the pattern is meant to
|
Which file to place a pattern in depends on how the pattern is meant to
|
||||||
be used. Patterns which should be version-controlled and distributed to
|
be used.
|
||||||
other repositories via clone (i.e., files that all developers will want
|
|
||||||
to ignore) should go into a `.gitignore` file. Patterns which are
|
* Patterns which should be version-controlled and distributed to
|
||||||
specific to a particular repository but which do not need to be shared
|
other repositories via clone (i.e., files that all developers will want
|
||||||
with other related repositories (e.g., auxiliary files that live inside
|
to ignore) should go into a `.gitignore` file.
|
||||||
the repository but are specific to one user's workflow) should go into
|
|
||||||
the `$GIT_DIR/info/exclude` file. Patterns which a user wants git to
|
* Patterns which are
|
||||||
ignore in all situations (e.g., backup or temporary files generated by
|
specific to a particular repository but which do not need to be shared
|
||||||
the user's editor of choice) generally go into a file specified by
|
with other related repositories (e.g., auxiliary files that live inside
|
||||||
`core.excludesfile` in the user's `~/.gitconfig`. Its default value is
|
the repository but are specific to one user's workflow) should go into
|
||||||
$XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty,
|
the `$GIT_DIR/info/exclude` file.
|
||||||
$HOME/.config/git/ignore is used instead.
|
|
||||||
|
* Patterns which a user wants git to
|
||||||
|
ignore in all situations (e.g., backup or temporary files generated by
|
||||||
|
the user's editor of choice) generally go into a file specified by
|
||||||
|
`core.excludesfile` in the user's `~/.gitconfig`. Its default value is
|
||||||
|
$XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or
|
||||||
|
empty, $HOME/.config/git/ignore is used instead.
|
||||||
|
|
||||||
The underlying git plumbing tools, such as
|
The underlying git plumbing tools, such as
|
||||||
'git ls-files' and 'git read-tree', read
|
'git ls-files' and 'git read-tree', read
|
||||||
|
Loading…
Reference in New Issue
Block a user