Skip to content

Commit 756fcd0

Browse files
ConradIrwinbirkskyumnotpeter
authored
Git tweaks (#28791)
Release Notes: - git: Add a `git_panel.sort_by_path` setting to mix untracked/tracked files in the diff list. - git: Remove the "•" placeholder for "Tracked". The commit button says "Commit Tracked" still by default, and this was misinterpreted to mean "partially staged". Hovering over the button will show you which files are tracked (in addition to the yellow square-with-a-dot-in-it). - Increase the default value of `expand_excerpt_lines` from 3 to 5. This makes it faster to see more context in the git diff view. --------- Co-authored-by: Birk Skyum <birk.skyum@pm.me> Co-authored-by: Peter Tripp <peter@zed.dev>
1 parent 3fd3779 commit 756fcd0

File tree

4 files changed

+229
-204
lines changed

4 files changed

+229
-204
lines changed

assets/settings/default.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
// Hide the values of in variables from visual display in private files
227227
"redact_private_values": false,
228228
// The default number of lines to expand excerpts in the multibuffer by.
229-
"expand_excerpt_lines": 3,
229+
"expand_excerpt_lines": 5,
230230
// Globs to match against file paths to determine if a file is private.
231231
"private_files": ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"],
232232
// Whether to use additional LSP queries to format (and amend) the code after
@@ -601,6 +601,13 @@
601601
//
602602
// Default: main
603603
"fallback_branch_name": "main",
604+
605+
// Whether to sort entries in the panel by path
606+
// or by status (the default).
607+
//
608+
// Default: false
609+
"sort_by_path": false,
610+
604611
"scrollbar": {
605612
// When to show the scrollbar in the git panel.
606613
//

0 commit comments

Comments
 (0)