summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-27 14:33:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-27 14:33:42 -0700
commitd89db6f4c3fceea7bc9e66823c7a04920e95ac1d (patch)
treebafdcec28f0fd91ad921d331e611b7836ed109cc /Documentation/config.txt
parentMerge branch 'nd/config-core-checkstat-doc' (diff)
parentbranch: support configuring --sort via .gitconfig (diff)
downloadtgif-d89db6f4c3fceea7bc9e66823c7a04920e95ac1d.tar.xz
Merge branch 'sm/branch-sort-config'
"git branch --list" learned to take the default sort order from the 'branch.sort' configuration variable, just like "git tag --list" pays attention to 'tag.sort'. * sm/branch-sort-config: branch: support configuring --sort via .gitconfig
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 136a345dd2..9f2deae463 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1054,6 +1054,12 @@ branch.autoSetupRebase::
branch to track another branch.
This option defaults to never.
+branch.sort::
+ This variable controls the sort ordering of branches when displayed by
+ linkgit:git-branch[1]. Without the "--sort=<value>" option provided, the
+ value of this variable will be used as the default.
+ See linkgit:git-for-each-ref[1] field names for valid values.
+
branch.<name>.remote::
When on branch <name>, it tells 'git fetch' and 'git push'
which remote to fetch from/push to. The remote to push to