diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:42 -0700 |
| commit | d89db6f4c3fceea7bc9e66823c7a04920e95ac1d (patch) | |
| tree | bafdcec28f0fd91ad921d331e611b7836ed109cc /Documentation | |
| parent | Merge branch 'nd/config-core-checkstat-doc' (diff) | |
| parent | branch: support configuring --sort via .gitconfig (diff) | |
| download | tgif-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')
| -rw-r--r-- | Documentation/config.txt | 6 | ||||
| -rw-r--r-- | Documentation/git-branch.txt | 5 |
2 files changed, 9 insertions, 2 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 diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 1072ca0eb6..9767b2b483 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -268,10 +268,11 @@ start-point is either a local or remote-tracking branch. order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git - for-each-ref`. Sort order defaults to sorting based on the + for-each-ref`. Sort order defaults to the value configured for the + `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and - finally remote-tracking branches. + finally remote-tracking branches. See linkgit:git-config[1]. --points-at <object>:: |