summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorSamuel Maftoul <samuel.maftoul@gmail.com>2018-08-16 09:35:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-16 18:17:10 (GMT)
commit560ae1c164ad040a389ccc47834dce8c15447294 (patch)
treeff10bf3737823e15698fabb29c4e0928321eda50 /Documentation
parent63749b2dea5d1501ff85bab7b8a7f64911d21dea (diff)
downloadgit-560ae1c164ad040a389ccc47834dce8c15447294.zip
git-560ae1c164ad040a389ccc47834dce8c15447294.tar.gz
git-560ae1c164ad040a389ccc47834dce8c15447294.tar.bz2
branch: support configuring --sort via .gitconfig
Add support for configuring default sort ordering for git branches. Command line option will override this configured value, using the exact same syntax. Signed-off-by: Samuel Maftoul <samuel.maftoul@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt6
-rw-r--r--Documentation/git-branch.txt5
2 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index fd8d27e..7f7a501 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1039,6 +1039,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 1072ca0..9767b2b 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>::