X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-show-branch.txt;h=5b80d5aa2a7a8c58bd525563996184f1100506c5;hb=348c4c66dacb1810a9bcd592e72f98a465233488;hp=5103c0c4f909a787e52c26cee4119212f1eb6c19;hpb=f85a41916163097c3c307ac45d1a935564c52bf0;p=git.git diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index 5103c0c4..5b80d5aa 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -8,7 +8,7 @@ git-show-branch - Show branches and their commits. SYNOPSIS -------- -'git show-branch [--all] [--heads] [--tags] [--more=] [--merge-base] ...' +'git show-branch [--all] [--heads] [--tags] [--more= | --list | --independent | --merge-base] ...' DESCRIPTION ----------- @@ -29,12 +29,24 @@ OPTIONS Usually the command stops output upon showing the commit that is the common ancestor of all the branches. This flag tells the command to go more common commits - beyond that. + beyond that. When is negative, display only the + s given, without showing the commit ancestry + tree. + +--list:: + Synomym to `--more=-1` --merge-base:: Instead of showing the commit list, just act like the - 'git-merge-base' command except that it can accept more - than two heads. + 'git-merge-base -a' command, except that it can accept + more than two heads. + +--independent:: + Among the s given, display only the ones that + cannot be reached from any other . + +Note that --more, --list, --independent and --merge-base options +are mutually exclusive. OUTPUT @@ -88,7 +100,7 @@ the name of the branch because it is obvious. $ git show-branch --more=4 master [master] Add 'git show-branch'. [~1] Add a new extended SHA1 syntax ~ -[~2] Fix "git-diff-script A B" +[~2] Fix "git-diff A B" [~3] git-ls-files: generalized pathspecs [~4] Make "git-ls-files" work in subdirectories ------------------------------------------------ @@ -105,4 +117,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the link:git.html[git] suite +Part of the gitlink:git[7] suite