Merge branch 'ma/simplify-merge-config-parsing'
[git] / Documentation / config / showbranch.txt
1 showBranch.default::
2         The default set of branches for linkgit:git-show-branch[1].
3         See linkgit:git-show-branch[1].