summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <danielsh@apache.org>2019-12-21 15:58:27 +0000
committerDaniel Shahaf <danielsh@apache.org>2019-12-22 03:21:04 +0000
commit6e5bba8cbac0b605f3e4d68a2fc123ad0beb1b55 (patch)
tree0638a7929b55f9b0641a2bd2e0b2d5e3b6aaf2ec
parent86db36ab705ea8225807b00b24b0c7df4033cbc6 (diff)
downloadzsh-6e5bba8cbac0b605f3e4d68a2fc123ad0beb1b55.tar.gz
zsh-6e5bba8cbac0b605f3e4d68a2fc123ad0beb1b55.tar.xz
zsh-6e5bba8cbac0b605f3e4d68a2fc123ad0beb1b55.zip
45113: vcs_info docs: Clarify documentation of the %p/%u/%a patch-format expandos.
-rw-r--r--ChangeLog3
-rw-r--r--Doc/Zsh/contrib.yo6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c2dc81d2f..bb283c3b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2019-12-22  Daniel Shahaf  <danielsh@apache.org>
 
+	* 45113: Doc/Zsh/contrib.yo: vcs_info docs: Clarify documentation
+	of the %p/%u/%a patch-format expandos.
+
 	* 45114: Functions/VCS_Info/VCS_INFO_patch2subject: vcs_info
 	quilt: Improve support for svn-style patch headers.
 
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index d51fd518b..558342711 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -1343,11 +1343,11 @@ endsitem()
 In tt(patch-format) and tt(nopatch-format) these replacements are done:
 
 startsitem()
-sitem(tt(%p))(The name of the top-most applied patch (tt(applied-string)).)
-sitem(tt(%u))(The number of unapplied patches (tt(unapplied-string)).)
+sitem(tt(%p))(The name of the top-most applied patch; may be overridden by the tt(applied-string) hook.)
+sitem(tt(%u))(The number of unapplied patches; may be overridden by the tt(unapplied-string) hook.)
 sitem(tt(%n))(The number of applied patches.)
 sitem(tt(%c))(The number of unapplied patches.)
-sitem(tt(%a))(The number of all patches.)
+sitem(tt(%a))(The number of all patches (tt(%a = %n + %c)).)
 sitem(tt(%g))(The names of active tt(mq) guards (tt(hg) backend).)
 sitem(tt(%G))(The number of active tt(mq) guards (tt(hg) backend).)
 endsitem()