about summary refs log tree commit diff
diff options
context:
space:
mode:
authorŠtěpán Němec <stepnem@gmail.com>2021-03-24 00:17:07 +0100
committerOliver Kiddle <opk@zsh.org>2021-03-28 10:49:34 +0200
commit42de9318f1bd05873eb850a830d30af13bc07415 (patch)
tree307dc73c5741f96383da8f52cb155248dba8a032
parentd7c8d6826deec089006d57ecdf6dc3f5c8a38d64 (diff)
downloadzsh-42de9318f1bd05873eb850a830d30af13bc07415.tar.gz
zsh-42de9318f1bd05873eb850a830d30af13bc07415.tar.xz
zsh-42de9318f1bd05873eb850a830d30af13bc07415.zip
48231: add missing git --pretty formats and improve descriptions
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git16
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d4ed3f09..6fb01eab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2021-03-28  Oliver Kiddle  <opk@zsh.org>
 
+	* Štěpán Němec: 48231: Completion/Unix/Command/_git:
+	add missing --pretty formats and improve descriptions
+
 	* 48230, 48233 (Jun T): Completion/Solaris/Command/_dtrace:
 	completion of dtrace probes and runtime options
 
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 81a060e4d..ced89b501 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -7573,13 +7573,15 @@ __git_setup_diff_stage_options () {
 __git_format_placeholders() {
   local sep
   local -a disp names placeholders expl
-  _describe -t formats format '( oneline:"commit-ids and subject of messages"
-    short:"few headers and only subject of messages"
-    medium:"most parts of messages"
-    full:"all parts of commit messages"
-    fuller:"like full and includes dates"
-    email:"use email headers like From and Subject"
-    raw:"the raw commits" )' -- '( format:"specify own format" )' -S ':' && return
+  _describe -t formats format '( oneline:"<hash> <title>"
+    short:"commit hash plus author and title headers"
+    medium:"like short plus author date header and full message"
+    full:"like medium with committer header instead of date"
+    fuller:"like full plus author and commit date headers"
+    reference:"<abbrev hash> (<title>, <short author date>)"
+    email:"email patch format"
+    mboxrd:"like email with From lines in message quoted with >"
+    raw:"entire commit object" )' -- '( format:"specify own format" )' -S ':' && return
   compset -P 'format:'
     compset -P '(%[^acgCG]|%?[^%]|[^%])#'
     if compset -P '%C'; then