diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-17 20:43:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-17 20:43:15 -0800 |
| commit | c816a6bc5a8494556e00c36d4ed4596a04efd38a (patch) | |
| tree | 3df66d2f08e6a2d14eb98b2a1b101dcc5d8cece6 /Documentation/git-show-branch.txt | |
| parent | 8d707b62930cabd45f063c3be568fe80b5c829a9 (diff) | |
| parent | 5a1fb2ca92caaa7ae9044ab81dc102f59d17b97a (diff) | |
| download | git-c816a6bc5a8494556e00c36d4ed4596a04efd38a.tar.gz git-c816a6bc5a8494556e00c36d4ed4596a04efd38a.tar.xz | |
Merge branch 'master' into next
* master:
3% tighter packs for free
Rewrite synopsis to clarify the two primary uses of git-checkout.
Fix minor typo.
Reference git-commit-tree for env vars.
Clarify git-rebase example commands.
Document the default source of template files.
Call out the two different uses of git-branch and fix a typo.
Add git-show reference
Diffstat (limited to 'Documentation/git-show-branch.txt')
| -rw-r--r-- | Documentation/git-show-branch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index d3b6e620a..f115b45ef 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -141,7 +141,7 @@ it, having the following in the configuration file may help: ------------ -With this,`git show-branch` without extra parameters would show +With this, `git show-branch` without extra parameters would show only the primary branches. In addition, if you happen to be on your topic branch, it is shown as well. |