X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=man1%2Fgit-show-branch.1;h=2a5876b828472d0d6119cc88226de4cf47dcdff9;hb=c720187e454696c492deebcc5c94089c636b8dec;hp=97f1030d23d878f4d49e1f6c5daec806726d2455;hpb=e75f2e752239751f41c8cb6aaa926a4f034a223b;p=git.git diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1 index 97f1030d..2a5876b8 100755 --- a/man1/git-show-branch.1 +++ b/man1/git-show-branch.1 @@ -19,7 +19,7 @@ .. .TH "GIT-SHOW-BRANCH" 1 "" "" "" .SH NAME -git-show-branch \- Show branches and their commits. +git-show-branch \- Show branches and their commits .SH "SYNOPSIS" .nf @@ -99,7 +99,7 @@ Following these N lines, one\-line log for each commit is displayed, indented N The following example shows three branches, "master", "fixes" and "mhf": -.IP +.nf $ git show\-branch master fixes mhf * [master] Add 'git show\-branch'\&. ! [fixes] Introduce "reset type" flag to "git reset" @@ -116,6 +116,8 @@ $ git show\-branch master fixes mhf + [mhf~7] Multi\-head fetch\&. + [mhf~8] Start adding the $GIT_DIR/remotes/ support\&. *++ [master] Add 'git show\-branch'\&. +.fi + These three branches all forked from a common commit, [master], whose commit message is "Add \fIgit show\-branch\fR\&. "fixes" branch adds one commit \fIIntroduce "reset type"\fR\&. "mhf" branch has many other commits\&. The current branch is "master"\&. @@ -124,11 +126,13 @@ These three branches all forked from a common commit, [master], whose commit mes If you keep your primary branches immediately under $GIT_DIR/refs/heads, and topic branches in subdirectories of it, having the following in the configuration file may help: -.IP +.nf [showbranch] default = \-\-topo\-order default = heads/* +.fi + 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\&.