From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Sep 2012 17:39:52 +0000 (-0700)
Subject: Merge branch 'po/maint-docs'
X-Git-Tag: v1.8.0-rc0~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ff91dbbf7d8ed9d1f67fe69e62fd883194916b07?ds=inline;hp=-c

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
---

ff91dbbf7d8ed9d1f67fe69e62fd883194916b07
diff --combined Documentation/git-branch.txt
index 9c1d2f1781,4f441311c2..45a225e0aa
--- a/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`).