summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git29
2 files changed, 30 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 238cd49d0..c5773aaa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2020-06-28 Daniel Shahaf <d.s@daniel.shahaf.name>
+ * 46128: Completion/Unix/Command/_git: Complete more options
+ and diff/merge tools.
+
* 46129: Completion/Unix/Command/_git: _git-config: Fix a bug
where a second trailing dot would be incorrectly offered.
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index f33ccf35a..1a8f28651 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -2396,6 +2396,7 @@ __git_config_option-or-value () {
blame.date:'date format to use in output::__git_date_formats:iso'
'branch.*.description:branch description:branch description:->string'
branch.sort:"default sorting order for 'git branch' output::__git_ref_sort_keys"
+ checkout.defaultRemote:'assumed remote name when specifying an unqualified remote branch name:remote name:__git_remotes'
cvsexportcommit.cvsdir:'the default location of the CVS checkout to use for the export:cvs export dir:_directories'
column.ui:'specify whether supported commands should output in columns.::->column:never'