X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-show-branch.txt;h=734336119c6b1f7ea8241f0404eaa3ba2ae10f69;hb=f012d27ff3e37d0412bba34ca53a2d444fd3c563;hp=89ec5364ecd447f6a7836d9c7f582dbd1d864807;hpb=d91ba8fa88a83ec70588700a56c8a4c1e8beb1be;p=git.git diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index 89ec5364e..734336119 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -8,11 +8,12 @@ git-show-branch - Show branches and their commits SYNOPSIS -------- [verse] -'git show-branch' [--all] [--remotes] [--topo-order | --date-order] - [--current] [--color | --no-color] +'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order] + [--current] [--color | --no-color] [--sparse] [--more= | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [ | ]... + 'git show-branch' (-g|--reflog)[=[,]] [--list] [] DESCRIPTION @@ -81,9 +82,11 @@ OPTIONS Synonym to `--more=-1` --merge-base:: - Instead of showing the commit list, just act like the - 'git-merge-base -a' command, except that it can accept - more than two heads. + Instead of showing the commit list, determine possible + merge bases for the specified commits. All merge bases + will be contained in all specified commits. This is + different from how linkgit:git-merge-base[1] handles + the case of three or more commits. --independent:: Among the s given, display only the ones that