Skip to content

Commit

Permalink
Merge branch 'po/maint-docs' into maint
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
gitster committed Oct 17, 2012
2 parents 8c4bcd3 + f0970fa commit 756583f
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 15 deletions.
3 changes: 2 additions & 1 deletion Documentation/fetch-options.txt
Expand Up @@ -10,7 +10,8 @@
--depth=<depth>::
Deepen the history of a 'shallow' repository created by
`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[]
--dry-run::
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-add.txt
Expand Up @@ -155,7 +155,7 @@ Configuration
The optional configuration variable `core.excludesfile` indicates a path to a
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
those in info/exclude. See linkgit:gitrepository-layout[5].
those in info/exclude. See linkgit:gitignore[5].


EXAMPLES
Expand Down
4 changes: 3 additions & 1 deletion Documentation/git-branch.txt
Expand Up @@ -129,11 +129,13 @@ This option is only applicable in non-verbose mode.
use `git branch --list <pattern>` to list matching branches.

-v::
-vv::
--verbose::
When in list mode,
show sha1 and commit subject line for each head, along with
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::
--quiet::
Expand Down
4 changes: 4 additions & 0 deletions Documentation/git-clean.txt
Expand Up @@ -63,6 +63,10 @@ OPTIONS
Remove only files ignored by git. This may be useful to rebuild
everything from scratch, but keep manually created files.

SEE ALSO
--------
linkgit:gitignore[5]

GIT
---
Part of the linkgit:git[1] suite
30 changes: 18 additions & 12 deletions Documentation/gitignore.txt
Expand Up @@ -41,18 +41,24 @@ precedence, the last matching pattern decides the outcome):
variable 'core.excludesfile'.

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
other repositories via clone (i.e., files that all developers will want
to ignore) should go into a `.gitignore` file. Patterns which are
specific to a particular repository but which do not need to be shared
with other related repositories (e.g., auxiliary files that live inside
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
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.
be used.

* Patterns which should be version-controlled and distributed to
other repositories via clone (i.e., files that all developers will want
to ignore) should go into a `.gitignore` file.

* Patterns which are
specific to a particular repository but which do not need to be shared
with other related repositories (e.g., auxiliary files that live inside
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
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
'git ls-files' and 'git read-tree', read
Expand Down

0 comments on commit 756583f

Please sign in to comment.