Merge branch 'po/maint-docs'

Various documentation fixups.

* 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

diff --combined Documentation/git-branch.txt
index 9c1d2f1781c15da786d0b1e9fb2d39562e474f29,4f441311c27766da6e1dfa4b1cfe8f228842626a..45a225e0aa0ea662393eb65fcb32b702bdd608e6
--- 1/Documentation/git-branch.txt
--- 2/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@@ -13,8 -13,6 +13,8 @@@ SYNOPSI
        [--column[=<options>] | --no-column]
        [(--merged | --no-merged | --contains) [<commit>]] [<pattern>...]
  'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
 +'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
 +'git branch' --unset-upstream [<branchname>]
  'git branch' (-m | -M) [<oldbranch>] <newbranch>
  'git branch' (-d | -D) [-r] <branchname>...
  'git branch' --edit-description [<branchname>]
@@@ -50,7 -48,7 +50,7 @@@ branch so that 'git pull' will appropri
  the remote-tracking branch. This behavior may be changed via the global
  `branch.autosetupmerge` configuration flag. That setting can be
  overridden by using the `--track` and `--no-track` options, and
 -changed later using `git branch --set-upstream`.
 +changed later using `git branch --set-upstream-to`.
  
  With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>.
  If <oldbranch> had a corresponding reflog, it is renamed to match
@@@ -131,11 -129,13 +131,13 @@@ This option is only applicable in non-v
        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::
@@@ -175,16 -175,6 +177,16 @@@ start-point is either a local or remote
        like `--track` would when creating the branch, except that where
        branch points to is not changed.
  
 +-u <upstream>::
 +--set-upstream-to=<upstream>::
 +      Set up <branchname>'s tracking information so <upstream> is
 +      considered <branchname>'s upstream branch. If no <branchname>
 +      is specified, then it defaults to the current branch.
 +
 +--unset-upstream::
 +      Remove the upstream information for <branchname>. If no branch
 +      is specified it defaults to the current branch.
 +
  --edit-description::
        Open an editor and edit the text to explain what the branch is
        for, to be used by various other commands (e.g. `request-pull`).